X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Roadmap;h=c5b8a4d115e361cae7077f11bcf8a6f8dc2f88f0;hb=986627cd67f4ff48152fa5147977813e2b190a93;hp=c4359b1387f0edec301ccbbc2d3c5e01d21750c9;hpb=4d138157507a6ac6e80fb0d6b5742a6e2ceaaf12;p=abartlet%2Fsamba.git%2F.git

diff --git a/Roadmap b/Roadmap
index c4359b1387f..c5b8a4d115e 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,25 +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 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.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		This release turned into maintenance mode since we
+			released 3.2.
 
-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.1.x		The test bed for all new developments. Do NOT use in any
-				production environment.
+Samba-3.4.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