Updated for 2.2.

Jeremy.

1 files changed, 22 insertions, 22 deletions

diff --git a/Roadmap b/Roadmap
index 83b0bcc0e6b..6d886f0d2a9 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,43 +1,43 @@
-Copyright (C) 1997-1999 - Samba-Team
+Copyright (C) 1997-2001 - Samba-Team
 
 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.4 is called the "NT Security update".
+The current Samba release 2.2 is the Windows 2000 update.
 
 It correctly implements the Windows NT specific SMB calls,
-and will operate correctly as a client in a Windows NT
-Domain environment.
+and will operate correctly as a client in a Windows NT and
+Windows 2000 Domain environment. In addition, preliminary
+support for Windows NT and Windows 2000 Domain Control has
+been implemented, although more remains to be done.
 
-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.
+Samba 2.2 can now support share level security changes from
+Windows NT/2000 server manager tools, and can integrate fully
+into a Windows NT/2000 Domain with no local users when using
+winbind (see the white paper on the Samba site).
 
-Some work has been done on ensuring compatibility with
-Windows NT 5.0 (now Windows 2000 :-) although this is
-a somewhat (slowly) moving target.
+This is also the first official release supporting the Samba-VFS
+layer, allowing non-disk resources such as databases to be
+exported to Windows clients as disk resources. More work will
+be done on this in the 2.2.x series.
+
+Windows 2000 is now the base tested client for Samba. All work
+is verified against Windows 2000 clients.
 
 The following development objectives for future releases
 are in place:
 
 ----------------------------------------------------------------------------
-2.0.x       -   "NT Security update" - Allowing Windows NT Clients to
-                manipulate file security and ownership using native tools.
-
-Note that the "NT Security update" part of the Roadmap has been
-achieved with the Samba 2.0.4 release.
-
-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.
-                Provision of command-line equivalents to native NT tools.
+2.2.x		-	Integration with native Windows server management tools,
+				including user account management and share management.
 
-2.X         -   "Domain Controller" - able to serve as a Windows NT PDC.
+3.0         -   "Domain Controller" - able to serve as a Windows NT PDC.
+				Unicode on the wire support.
 
 X.XX        -   "Full Domain Integration" - allowing both PDC and BDC modes.
 
 Note that it is a given that the Samba Team will continue to track
-Windows (NT/2000) update releases, ensuring that Samba will work
+Windows (2000/XP) 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