merge from 2.2

(This used to be commit 5932471a03e74ef7fcc71e22dbb52c530332a713)

1 files changed, 33 insertions, 21 deletions

diff --git a/swat/help/welcome.html b/swat/help/welcome.html
index bfcde7672c5..1c23d35a27c 100644
--- a/swat/help/welcome.html
+++ b/swat/help/welcome.html
@@ -2,7 +2,7 @@
 
 Please choose a configuration action using one of the above buttons
 
-<h3>Documentation</h3>
+<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Documentation</h3>
 
 <ul>
  <li><b>Daemons</b>
@@ -11,46 +11,58 @@ Please choose a configuration action using one of the above buttons
     <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver
     <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - the winbind daemon
    </ul>
+ <li><b>Configuration Files</b>
+   <ul>
+    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file
+    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file
+    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file
+   </ul>
  <li><b>Administrative Utilities</b>
    <ul>
     <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons
-    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
-    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web configuration tool
     <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords
+    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web configuration tool
     <li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - codepage creation
     <li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode map file creation
-     
-    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - validating your config file
-    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - testing printer configuration
+    <li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - internal smbd utility
    </ul>
- <li><b>General Utilities</b>
+ <li><b>Client Tools</b>
    <ul>
-    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
+    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client
     <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
     <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
+    <li><a href="/swat/help/smbmnt.8.html"  target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts
+    <li><a href="/swat/help/smbmount.8.html"  target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux
     <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - command line SMB print client
+    <li><a href="/swat/help/smbumount.8.html"  target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux
    </ul>
- <li><b>Configuration Files</b>
+ <li><b>Diagnostic Utilities</b>
    <ul>
-    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file
-    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file
-    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file
+    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
+    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - validating your config file
+    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - testing printer configuration
+    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
    </ul>
- <li><b>Miscellaneous</b>
+ <li><b>Books</b>
    <ul>
-    <li><a href="/swat/help/samba.7.html" target="docs">Samba introduction</a>
-    <li><a href="/swat/help/DOMAIN_MEMBER.html" target="docs">Joining an NT Domain</a>
-    <li><a href="/swat/help/NT_Security.html" target="docs">Changing UNIX permissions using NT</a>
-    <li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - internal smbd utility
+    <li><a href="/swat/using_samba/index.html" target="docs">Using Samba</a> - by Robert Eckstein, David Collier-Brown and Peter Kelly
    </ul>
- <li><b>Books</b>
+ <li><b>Samba HOWTO Collection</b></li>
    <ul>
-   <li><a href="/swat/using_samba/index.html" target="docs">Using Samba</a> - by Robert Eckstein, David Collier-Brown and Peter Kelly
+     <li><a href="/swat/help/Samba-HOWTO-Collection.html">Entire Collection (one file)</a>
+     <li><a href="/swat/help/DOMAIN_MEMBER.html">security = domain in Samba 2.x</a>
+     <li><a href="/swat/help/winbind.html">Unified Logons between Windows NT and UNIX Using Winbind</a>
+     <li><a href="/swat/help/msdfs_setup.html">Setting Samba as an MS-DFS server</a>
+     <li><a href="/swat/help/NT_Security.html">UNIX Permission Bits and Samba 2.x</a>
+     <li><a href="/swat/help/OS2-Client-HOWTO.html">OS/2 Clients and Samba</a>
+     <li><a href="/swat/help/printer_driver2.html">Printing under Samba 2.2.x</a>
+     <li><a href="/swat/help/UNIX_INSTALL.html">HOWTO Install and Test Samba</a>
+     <li><a href="/swat/help/Integrating-with-Windows.html">Integrating Name Resolution and Authentication Services</a>
+     <li><a href="/swat/help/CVS-Access.html">CVS Access to Samba code</a>
    </ul>
 </ul>
  
  <h3>Feedback</h3>
 
- Please join the <A
- HREF="http://lists.samba.org/listinfo/samba/">samba</A> mailing
+ Please join the <A HREF="http://lists.samba.org/">samba</A> mailing
  list if you want to discuss issues with this release of SWAT.