X-Git-Url: http://git.samba.org/samba.git/?p=gd%2Fsamba%2F.git;a=blobdiff_plain;f=Roadmap;h=c4359b1387f0edec301ccbbc2d3c5e01d21750c9;hp=4692807eab8109a77d5e944a1216e3d5a9783cec;hb=84112a24f5292b8d2e4d446e39462e0402453b4a;hpb=b843c482f479c9d9f4f358dac8c697a5963265e5

diff --git a/Roadmap b/Roadmap
index 4692807eab8..c4359b1387f 100644
--- a/Roadmap
+++ b/Roadmap
@@ -3,19 +3,23 @@ Copyright (C) 1997-2003 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"
+The current Samba series of Samba 3.0.0 is called the "Domain Integration"
 release.
 
 The following development objectives for future releases
 are in progress:
 ----------------------------------------------------------------------------
-Samba-3.0.0		The Domain Integration Release
+Samba-3.0.20	The release that is focussing on scalability and domain
+				integration and migration. See the WHATSNEW.txt file for
+				update notes.
 
-Samba-3.0.x		Refinments to the User and Group IDMAP facility and
-			general code stabilization work.
+Samba-3.0.x		Improvements in Management and Migration tools, &
+				general code stabilization work. It is recommended to use
+				only stable releases in production environments. You have
+				been duly warned!
 
-Samba-3.x.x		Improvements in Management and Migration tools, 
-			the introduction of further integration capabilities.
+Samba-3.1.x		The test bed for all new developments. Do NOT use in any
+				production environment.
 
 Samba-4			Danger Will Robinson, a big code clean up with major
 			system redesign. More will be announced as this work
@@ -28,4 +32,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.