X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=Roadmap;h=12b9e8fee99b9a27cbc8b93e5b70749fb8cf6df0;hb=1ada9c4ef787af4097f228c4629fac99a5b9bf13;hp=6d678783f5721af7a5d57b3c7b8d224ba3fd3ef5;hpb=4038d42bc6b3a8dcf96bad8b0e7ad019d307999b;p=kai%2Fsamba-autobuild%2F.git

diff --git a/Roadmap b/Roadmap
index 6d678783f57..12b9e8fee99 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,30 +1,24 @@
-Copyright (C) 1997-2003 Samba-Team
+Copyright (C) 1997-2014 Samba-Team
 
 The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-The current Samba series of Samba 3.0.0 is called the "Domain Integration"
-release.
+Please also look at the Release planning 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.6.x		This release turned into security maintenance mode since we
+			released 4.1.
 
-Samba-3.0.x		Improvements in Management and Migration tools, &
-			general code stabilization work.
+Samba-4.0.x		Our previous release including the AD domain controller
+                        feature, the file server and other functionality
+                        from Samba 3.6 as well as the new SMB3 protocol.
 
-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.1.x		Our current release.
 
 
 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 :-).