Merge branch 'master' of ssh://git.samba.org/data/git/samba

[mimir/samba.git] / Roadmap

diff --git a/Roadmap b/Roadmap
index baeed630a1c60b118ec340d822df6a4ca978222b..c5b8a4d115e361cae7077f11bcf8a6f8dc2f88f0 100644 (file)
--- a/Roadmap
+++ b/Roadmap
@@ -1,30 +1,29 @@
-Copyright (C) 1997 - Samba-Team
+Copyright (C) 1997-2008 Samba-Team
 
-The Samba-Team are committed to an agressive program to deliver quailty
+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:
+Please also look at the Samba3 and Samba4 pages of wiki.samba.org for more
+information.
 
-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
+The following development objectives for future releases
+are in progress:
+----------------------------------------------------------------------------
+Samba-3.0.x            This release turned into maintenance mode since we
+                       released 3.2.
 
-1.9.19                 An authentication update release to offer improved
-"Auth Code Release"    security and password synchronisation capabilities
+Samba-3.4.x            This is the current stable Samba 3 release intended
+                       for all Samba production server.
 
-1.9.20                 Introduction of new managment tools
-"GUI Config Release"   Improved multi-language support.
+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.
 
-2.0                    The next generation Directory Services update
-"DSA Release"
 
-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 commit to exact timeframes.