X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Roadmap;h=8f664ece1adb0ba3ebccf69fd7e5eb66ec893c31;hb=d610339028443f74248aec4bb9b4caa62daa1ff4;hp=4531a34e03113854ec6db34bd812eebb6f2ce36e;hpb=4ddd855d706df5d3aacfcc0121a926d6f43cae02;p=mat%2Fsamba.git

diff --git a/Roadmap b/Roadmap
index 4531a34e03..8f664ece1a 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,44 +1,25 @@
-Copyright (C) 1997-1998 - Samba-Team
+Copyright (C) 1997-2008 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.18 is called the "Oplock Release"
-The following development objectives are in place:
-----------------------------------------------------------------------------
-Please Note: Development of the 1.9.19 and 1.9.20 releases is presently
-	     well ahead of schedule. This means that the release program
-	     may very well change radically from what is outlined below.
-
-	     If present developments continue then 1.9.19 will feature
-	     improved authentication and security capabilities as well as
-	     the long promised GUI (Web) based management tools.
-
-	     This being the case, then version 2.0 may become the long
-	     awaited Windows NT Domain Controller Release and version 2.1
-	     will become the Directory Services update.
+Please also look at the Samba3 and Samba4 pages of wiki.samba.org for more
+information.
 
-	     Should 1.9.19 roll out ahead of schedule then there will
-	     likely be a delay of up to 6 months before the NT Domain
-	     Controller release will be ready for prime-time business use.
+The following development objectives for future releases
+are in progress:
 ----------------------------------------------------------------------------
+Samba-3.5.x		This release turned into maintenance mode since we
+			released 3.6.
 
-Version	/ Codename	Notes
-------------------	----------------------------------------------------
-1.9.19			An authentication update release to offer improved
-"Auth Code Release"	security and password synchronisation capabilities.
-                        Also, support for Windows NT specific SMB calls.
-
-1.9.20			Introduction of new managment tools
-"GUI Config Release"	Improved multi-language support.
-
-2.0			The next generation Directory Services update
-"DSA Release"
+Samba-3.6.x		This is the current stable Samba 3 release intended
+			for all Samba production server.
 
-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.
+Samba-4.0		Our next release including the AD domain controller
+                        feature, the file server and other functionality
+                        from Samba 3.6 as well as the new SMB3 protocol.
 
-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 releases, ensuring that Samba will work
+well with whatever releases Redmond throws our way :-).