summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-11-10 10:02:15 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-12-07 03:09:08 +0100
commitf8e26c6920420aa072ef337ec5f7f5c40ba0f2e4 (patch)
tree95dd9b46e4b5c35f537853322a3fb4b24bbe9ed6
parent60925179c96cfa717396b059a3c44895ed7ef8ef (diff)
downloadsamba-f8e26c6920420aa072ef337ec5f7f5c40ba0f2e4.tar.gz
clarify Roadmap, as the shape of Samba 4.0 is much clearer now
-rw-r--r--Roadmap14
1 files changed, 5 insertions, 9 deletions
diff --git a/Roadmap b/Roadmap
index 114fbf3091c..c79176dbd6a 100644
--- a/Roadmap
+++ b/Roadmap
@@ -15,15 +15,11 @@ Samba-3.0.x This release turned into maintenance mode since we
Samba-3.6.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
- starts to take shape.
+Samba-4.0 A future release including the AD domain controller
+ feature, and the file server and other functionality
+ from Samba 3.6.
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.
+Windows releases, ensuring that Samba will work
+well with whatever releases Redmond throws our way :-).