X-Git-Url: http://git.samba.org/samba.git/?p=tprouty%2Fsamba.git;a=blobdiff_plain;f=Roadmap;h=4692807eab8109a77d5e944a1216e3d5a9783cec;hp=556e49d342f10e3fe1243c49699e6f16b7001fce;hb=833bc5c06018043cf0eb6bdcbb96922964286559;hpb=800a7218bcdf3ce57af0ce0428f96d42edc1d188

diff --git a/Roadmap b/Roadmap
index 556e49d342..4692807eab 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,32 +1,31 @@
-Copyright (C) 1997 - Samba-Team
+Copyright (C) 1997-2003 Samba-Team
 
-The Samba-Team are committed to an agressive program to deliver quality
+The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-The current Samba release 1.9.17 is called the "Browse Fix Release"
-The following development objectives are in place:
+The current Samba Beta series of Samba 3.0.0 is called the "Domain Integration"
+release.
 
-Version	/ Codename	Notes
-------------------	----------------------------------------------------
-1.9.18 			This version will feature two main areas of improvement
-"Perf-Lock Release"	- introduction of OpLock support
-			- introduction of new browse list and WINS methods
-			- introduction of experimental NT Domain Authentication
-			  as a compile-time option only.
+The following development objectives for future releases
+are in progress:
+----------------------------------------------------------------------------
+Samba-3.0.0		The Domain Integration Release
 
-1.9.19			An authentication update release to offer improved
-"Auth Code Release"	security and password synchronisation capabilities
+Samba-3.0.x		Refinments to the User and Group IDMAP facility and
+			general code stabilization work.
 
-1.9.20			Introduction of new managment tools
-"GUI Config Release"	Improved multi-language support.
+Samba-3.x.x		Improvements in Management and Migration tools, 
+			the introduction of further integration capabilities.
 
-2.0			The next generation Directory Services update
-"DSA Release"
+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.
 
-While no release date or content promises are made we are hoping to release
-the remainder of the 1.9 series relases within short time frame.
 
-Should a budding contributor spring into gear and deliver any of the above
-ahead of the above release sequence then we reserve the option to make an
-out of sequence release (but always keeping to a logical sequence code number).
+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.