X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=blobdiff_plain;f=swat%2Fhelp%2Fwelcome.html;h=bf045806fe36e12fc1ddde543d08e80487c5b2e2;hp=1c23d35a27c104d642031dc027e433cfce5af42c;hb=6f657c873efa4779e762a8f9ede97e19da6fb7ec;hpb=ef3197889f53794a54274df5c2a6ff057d8afe51

diff --git a/swat/help/welcome.html b/swat/help/welcome.html
index 1c23d35a27c..bf045806fe3 100644
--- a/swat/help/welcome.html
+++ b/swat/help/welcome.html
@@ -2,63 +2,61 @@
 
 Please choose a configuration action using one of the above buttons
 
-<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Documentation</h3>
+<h3><a href="/swat/help/manpages/samba.7.html" target="docs">Samba</a> Documentation</h3>
 
 <ul>
  <li><b>Daemons</b>
    <ul>
-    <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - the SMB daemon
-    <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
+    <li><a href="/swat/help/manpages/smbd.8.html" target="docs">smbd</a> - the SMB daemon
+    <li><a href="/swat/help/manpages/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver
+    <li><a href="/swat/help/manpages/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
+    <li><a href="/swat/help/manpages/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file
+    <li><a href="/swat/help/manpages/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file
+    <li><a href="/swat/help/manpages/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/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/smbrun.1.html" target="docs">smbrun</a> - internal smbd utility
+    <li><a href="/swat/help/manpages/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons
+    <li><a href="/swat/help/manpages/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords
+    <li><a href="/swat/help/manpages/swat.8.html" target="docs">SWAT</a> - web configuration tool
+    <li><a href="/swat/help/manpages/net.8.html" target="docs">net</a> - tool for administration of Samba and remote CIFS servers
+    <li><a href="/swat/help/manpages/pdbedit.8.html" target="docs">pdbedit</a> - Samba user account management tool
+    <li><a href="/swat/help/manpages/tdbbackup.8.html" target="docs">tdbbackup</a> - Tool for backing up TDB databases
    </ul>
  <li><b>Client Tools</b>
    <ul>
-    <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
+    <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client
+    <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
+    <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
+    <li><a href="/swat/help/manpages/smbmnt.8.html"  target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts
+    <li><a href="/swat/help/manpages/smbmount.8.html"  target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux
+    <li><a href="/swat/help/manpages/smbumount.8.html"  target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux
+    <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication
+    <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares
+    <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer
+    <li><a href="/swat/help/manpages/smbtree.1.html" target="docs">smbtree</a> - Text-based SMB network browsing
    </ul>
  <li><b>Diagnostic Utilities</b>
    <ul>
-    <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
+    <li><a href="/swat/help/manpages/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
+    <li><a href="/swat/help/manpages/testparm.1.html" target="docs">testparm</a> - validating your config file
+    <li><a href="/swat/help/manpages/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
+    <li><a href="/swat/help/manpages/wbinfo.1.html" target="docs">wbinfo</a> - Tool for getting winbind information
    </ul>
- <li><b>Books</b>
+ <li><b>Misc. Utilities</b>
    <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/manpages/profiles.1.html" target="docs">profiles</a> - migrating profiles from one domain to another
+    <li><a href="/swat/help/manpages/log2pcap.1.html" target="docs">log2pcap</a> - generate pcap files from samba log files
    </ul>
- <li><b>Samba HOWTO Collection</b></li>
+ <li><b>Books</b>
    <ul>
-     <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>
+    <li><a href="/swat/help/using_samba/toc.html" target="docs">Using Samba, 2ed.</a> - by Jay Ts, Robert Eckstein, and David Collier-Brown
+    <li><a href="/swat/help/Samba3-HOWTO/" target="docs">The Official Samba HOWTO and Reference Guide</a>
+    <li><a href="/swat/help/Samba3-ByExample/" target="docs">Samba 3 by Example</a>
+    <li><a href="/swat/help/Samba3-Developers-Guide/" target="docs">The Samba Developer Guide</a>
    </ul>
 </ul>