X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Roadmap;h=96b80524707a0d1709c4fb7c5a84d5623b4f81c0;hb=3ac2d4b59eff58f06af1eef19cef0d444f4257ca;hp=c5b8a4d115e361cae7077f11bcf8a6f8dc2f88f0;hpb=33251da8611ddc98c3ae73d62601218e5b784e63;p=obnox%2Fsamba%2Fsamba-obnox.git

diff --git a/Roadmap b/Roadmap
index c5b8a4d115e..96b80524707 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,29 +1,24 @@
-Copyright (C) 1997-2008 Samba-Team
+Copyright (C) 1997-2015 Samba-Team
 
 The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-Please also look at the Samba3 and Samba4 pages of wiki.samba.org for more
+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.x		This release turned into maintenance mode since we
-			released 3.2.
+Samba-4.0.x		This release turned into security maintenance mode
+			since we released 4.2.
 
-Samba-3.4.x		This is the current stable Samba 3 release intended
-			for all Samba production server.
+Samba-4.1.x		Our previous release including the AD domain
+			controller feature, the file server and other
+			functionality from Samba 4.0.
 
-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.2.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 :-).