X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Roadmap;h=8f664ece1adb0ba3ebccf69fd7e5eb66ec893c31;hb=aca475b6bcbe364d09b83d17bf0504741ed3a84a;hp=42c63f78098e180b85e55aca81828586bc91a2b4;hpb=855b82267ebd05c71728f4c22a2f9caef72a4a41;p=mat%2Fsamba.git

diff --git a/Roadmap b/Roadmap
index 42c63f7809..8f664ece1a 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,30 +1,25 @@
-Copyright (C) 1997-2003 Samba-Team
+Copyright (C) 1997-2008 Samba-Team
 
 The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-The current Samba Beta series of Samba 3.0.0 is called the "Domain Integration"
-release.
+Please also look at the Samba3 and Samba4 pages of wiki.samba.org for more
+information.
 
 The following development objectives for future releases
 are in progress:
 ----------------------------------------------------------------------------
-Samba-3.0.0		The Domain Integration Release.
+Samba-3.5.x		This release turned into maintenance mode since we
+			released 3.6.
 
-Samba-3.0.x		Improvements in Management and Migration tools, &
-			general code stabilization work.
+Samba-3.6.x		This is the current stable Samba 3 release intended
+			for all Samba production server.
 
-Samba-3.x.x		Requirements are currently under discussion.
-
-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 yet commit to exact timeframes.
+Windows releases, ensuring that Samba will work
+well with whatever releases Redmond throws our way :-).