X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Roadmap;h=1132f6391c7bccac2f6583133bf0100ce2411627;hb=59ca550f2fd6b0fcab57ccdfc638c24eb44ff3a8;hp=4692807eab8109a77d5e944a1216e3d5a9783cec;hpb=4a090ba06a54f5da179ac02bb307cc03d08831bf;p=obnox%2Fsamba-ctdb.git

diff --git a/Roadmap b/Roadmap
index 4692807eab..1132f6391c 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,21 +1,19 @@
-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.0.x		This release turned into maintenance mode since we
+			released 3.2.
 
-Samba-3.0.x		Refinments to the User and Group IDMAP facility and
-			general code stabilization work.
-
-Samba-3.x.x		Improvements in Management and Migration tools, 
-			the introduction of further integration capabilities.
+Samba-3.2.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
@@ -28,4 +26,4 @@ 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.
+as we cannot commit to exact timeframes.