tdb: Slightly simplify tdb_expand_file

[samba.git] / Roadmap

diff --git a/Roadmap b/Roadmap
index 1132f6391c7bccac2f6583133bf0100ce2411627..8f664ece1adb0ba3ebccf69fd7e5eb66ec893c31 100644 (file)
--- a/Roadmap
+++ b/Roadmap
@@ -9,21 +9,17 @@ information.
 The following development objectives for future releases
 are in progress:
 ----------------------------------------------------------------------------
-Samba-3.0.x            This release turned into maintenance mode since we
-                       released 3.2.
+Samba-3.5.x            This release turned into maintenance mode since we
+                       released 3.6.
 
-Samba-3.2.x            This is the current stable Samba 3 release intended
+Samba-3.6.x            This is the current stable Samba 3 release intended
                        for all Samba production server.
 
-Samba-4                        Danger Will Robinson, a big code clean up with major
-                       system redesign. More will be announced as this work
-                       starts to take shape.
+Samba-4.0              Our next release including the AD domain controller
+                        feature, the file server and other functionality
+                        from Samba 3.6 as well as the new SMB3 protocol.
 
 
 Note that it is a given that the Samba-Team will continue to track
-Windows (NT/200x) update releases, ensuring that Samba will work
-well with whatever "Beta" releases Redmond throws our way :-).
-
-You may also note that the release numbers get fuzzier the
-further into the future the objectives get. This is intentional
-as we cannot commit to exact timeframes.
+Windows releases, ensuring that Samba will work
+well with whatever releases Redmond throws our way :-).