X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Roadmap;h=12b9e8fee99b9a27cbc8b93e5b70749fb8cf6df0;hb=c5b54ea1adb14b04e10cd4fa509345fe78942a75;hp=23d39ab3a538afa87a0affc4a1bce100f8bc45f2;hpb=f08caf67e43c48a2cde58a22233906972136494a;p=obnox%2Fsamba%2Fsamba-obnox.git

diff --git a/Roadmap b/Roadmap
index 23d39ab3a53..12b9e8fee99 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,41 +1,24 @@
-Copyright (C) 1997-1998 - Samba-Team
+Copyright (C) 1997-2014 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 2.0.0 is called the "Domain Client Release"
-
-It correctly implements the Windows NT specific SMB calls,
-and will operate correctly as a client in a Windows NT
-Domain environment.
-
-In addition, the first implementation of the Web-based GUI
-management tool ships with 2.0.0, thus fullfilling some of
-the commitments made in the 1.9.18 release Roadmap document.
-
-Some work has been done on ensuring compatibility with
-Windows NT 5.0 (now Windows 2000 :-) although this is
-a somewhat (slowly) moving target.
+Please also look at the Release planning pages of wiki.samba.org for more
+information.
 
 The following development objectives for future releases
-are in place:
-
+are in progress:
 ----------------------------------------------------------------------------
-2.0.x       -   "NT Security update" - Allowing Windows NT Clients to
-                manipulate file security and ownership using native tools.
-
-2.0.xx      -   "Thin Server" mode, allowing a Samba server to be
-                inserted into a network with no UNIX setup required.
-                Some management capabilities for Samba using native NT tools.
+Samba-3.6.x		This release turned into security maintenance mode since we
+			released 4.1.
 
-2.X         -   "Domain Controller" - able to serve as a Windows NT PDC.
+Samba-4.0.x		Our previous release including the AD domain controller
+                        feature, the file server and other functionality
+                        from Samba 3.6 as well as the new SMB3 protocol.
 
-X.XX        -   "Full Domain Integration" - allowing both PDC and BDC modes.
+Samba-4.1.x		Our current release.
 
-Note that it is a given that the Samba Team will continue to track
-Windows (NT/2000) 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.
+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 :-).