From 27aef6855f1543547b8190f06fd264d1b52a558d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 6 Apr 2003 18:42:44 +0000
Subject: Regenerate docs (This used to be commit
 5a2aaa3d5b039776314067aee953921e7865dc4d)

---
 docs/htmldocs/ads.html                    |  134 +++-
 docs/htmldocs/appendixes.html             |  370 +++++-----
 docs/htmldocs/browsing-quick.html         |  210 ++++--
 docs/htmldocs/bugreport.html              |   99 ++-
 docs/htmldocs/compiling.html              |  186 ++++--
 docs/htmldocs/diagnosis.html              |  147 ++--
 docs/htmldocs/domain-security.html        |    4 +-
 docs/htmldocs/groupmapping.html           |   28 +-
 docs/htmldocs/improved-browsing.html      |  299 ++++++---
 docs/htmldocs/install.html                |   22 +-
 docs/htmldocs/integrate-ms-networks.html  |   56 +-
 docs/htmldocs/introduction.html           |  119 ++--
 docs/htmldocs/msdfs.html                  |   30 +-
 docs/htmldocs/nmbd.8.html                 |  206 ++----
 docs/htmldocs/nmblookup.1.html            |  199 ++++--
 docs/htmldocs/optional.html               |  837 +++++++++++++----------
 docs/htmldocs/other-clients.html          |  106 ++-
 docs/htmldocs/pam.html                    |   68 +-
 docs/htmldocs/passdb.html                 |  136 ++--
 docs/htmldocs/pdbedit.8.html              |  121 +++-
 docs/htmldocs/portability.html            |   26 +-
 docs/htmldocs/printing.html               |  150 +++--
 docs/htmldocs/rpcclient.1.html            | 1041 ++++++++++++++++++++---------
 docs/htmldocs/samba-bdc.html              |   18 +-
 docs/htmldocs/samba-howto-collection.html |  785 +++++++++++++---------
 docs/htmldocs/samba-pdc.html              |   25 +-
 docs/htmldocs/securing-samba.html         |   36 +-
 docs/htmldocs/securitylevels.html         |   18 +-
 docs/htmldocs/smb.conf.5.html             |  459 +++++++++++--
 docs/htmldocs/smbcacls.1.html             |  110 ++-
 docs/htmldocs/smbclient.1.html            |  463 ++++++-------
 docs/htmldocs/smbcontrol.1.html           |  337 ++++++----
 docs/htmldocs/smbd.8.html                 |  154 ++---
 docs/htmldocs/smbmnt.8.html               |   14 +-
 docs/htmldocs/smbmount.8.html             |   28 +-
 docs/htmldocs/smbsh.1.html                |  173 ++---
 docs/htmldocs/smbspool.8.html             |    4 +-
 docs/htmldocs/smbstatus.1.html            |   96 ++-
 docs/htmldocs/smbtar.1.html               |   23 +-
 docs/htmldocs/speed.html                  |   52 +-
 docs/htmldocs/swat.8.html                 |  128 +++-
 docs/htmldocs/testparm.1.html             |   24 +-
 docs/htmldocs/testprns.1.html             |    2 +-
 docs/htmldocs/type.html                   |   80 +--
 docs/htmldocs/unix-permissions.html       |   84 ++-
 docs/htmldocs/vfs.html                    |   76 ++-
 docs/htmldocs/vfstest.1.html              |   69 +-
 docs/htmldocs/wbinfo.1.html               |   54 +-
 docs/htmldocs/winbind.html                |  128 ++--
 docs/htmldocs/winbindd.8.html             |  161 +++--
 50 files changed, 5119 insertions(+), 3076 deletions(-)

(limited to 'docs/htmldocs')

diff --git a/docs/htmldocs/ads.html b/docs/htmldocs/ads.html
index f37bbf0abc..d6678c250a 100644
--- a/docs/htmldocs/ads.html
+++ b/docs/htmldocs/ads.html
@@ -83,7 +83,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1251"
+NAME="AEN1336"
 >8.1. Setup your <TT
 CLASS="FILENAME"
 >smb.conf</TT
@@ -111,26 +111,57 @@ CLASS="FILENAME"
 CLASS="PROGRAMLISTING"
 >  ads server = your.kerberos.server</PRE
 ></P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
 ><P
 >You do *not* need a smbpasswd file, and older clients will
-  be authenticated as if "security = domain", although it won't do any harm
+  be authenticated as if <B
+CLASS="COMMAND"
+>security = domain</B
+>,
+  although it won't do any harm
   and allows you to have local users not in the domain.
   I expect that the above required options will change soon when we get better
   active directory integration.</P
+></TD
+></TR
+></TABLE
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1262"
+NAME="AEN1349"
 >8.2. Setup your <TT
 CLASS="FILENAME"
 >/etc/krb5.conf</TT
 ></A
 ></H1
 ><P
->The minimal configuration for krb5.conf is:</P
+>The minimal configuration for <TT
+CLASS="FILENAME"
+>krb5.conf</TT
+> is:</P
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
@@ -140,10 +171,43 @@ CLASS="PROGRAMLISTING"
     }</PRE
 ></P
 ><P
->Test your config by doing a "kinit USERNAME@REALM" and making sure that
+>Test your config by doing a <KBD
+CLASS="USERINPUT"
+>kinit <VAR
+CLASS="REPLACEABLE"
+>USERNAME</VAR
+>@<VAR
+CLASS="REPLACEABLE"
+>REALM</VAR
+></KBD
+> and making sure that
   your password is accepted by the Win2000 KDC. </P
+><DIV
+CLASS="NOTE"
 ><P
->NOTE: The realm must be uppercase. </P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>The realm must be uppercase. </P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >You also must ensure that you can do a reverse DNS lookup on the IP
 address of your KDC. Also, the name that this reverse lookup maps to
@@ -151,13 +215,28 @@ must either be the netbios name of the KDC (ie. the hostname with no
 domain attached) or it can alternatively be the netbios name
 followed by the realm. </P
 ><P
->The easiest way to ensure you get this right is to add a /etc/hosts
-entry mapping the IP address of your KDC to its netbios name. If you
-don't get this right then you will get a "local error" when you try
-to join the realm.</P
+>The easiest way to ensure you get this right is to add a 
+<TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+> entry mapping the IP address of your KDC to 
+its netbios name. If you don't get this right then you will get a 
+"local error" when you try to join the realm.</P
 ><P
 >If all you want is kerberos support in smbclient then you can skip
-straight to step 5 now. Step 3 is only needed if you want kerberos
+straight to <A
+HREF="ads.html#ADS-TEST-SMBCLIENT"
+>Test with smbclient</A
+> now. 
+<A
+HREF="ads.html#ADS-CREATE-MACHINE-ACCOUNT"
+>Creating a computer account</A
+> 
+and <A
+HREF="ads.html#ADS-TEST-SERVER"
+>testing your servers</A
+>
+is only needed if you want kerberos
 support for smbd and winbindd.</P
 ></DIV
 ><DIV
@@ -165,22 +244,22 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1273"
+NAME="ADS-CREATE-MACHINE-ACCOUNT"
 >8.3. Create the computer account</A
 ></H1
 ><P
 >As a user that has write permission on the Samba private directory
 (usually root) run:
-<B
-CLASS="COMMAND"
->net ads join</B
+<KBD
+CLASS="USERINPUT"
+>net ads join</KBD
 ></P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1277"
+NAME="AEN1373"
 >8.3.1. Possible errors</A
 ></H2
 ><P
@@ -205,18 +284,18 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1285"
+NAME="ADS-TEST-SERVER"
 >8.4. Test your server setup</A
 ></H1
 ><P
->On a Windows 2000 client try <B
-CLASS="COMMAND"
->net use * \\server\share</B
+>On a Windows 2000 client try <KBD
+CLASS="USERINPUT"
+>net use * \\server\share</KBD
 >. You should
 be logged in with kerberos without needing to know a password. If
-this fails then run <B
-CLASS="COMMAND"
->klist tickets</B
+this fails then run <KBD
+CLASS="USERINPUT"
+>klist tickets</KBD
 >. Did you get a ticket for the
 server? Does it have an encoding type of DES-CBC-MD5 ? </P
 ></DIV
@@ -225,20 +304,23 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1290"
+NAME="ADS-TEST-SMBCLIENT"
 >8.5. Testing with smbclient</A
 ></H1
 ><P
 >On your Samba server try to login to a Win2000 server or your Samba
 server using smbclient and kerberos. Use smbclient as usual, but
-specify the -k option to choose kerberos authentication.</P
+specify the <VAR
+CLASS="PARAMETER"
+>-k</VAR
+> option to choose kerberos authentication.</P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1293"
+NAME="AEN1390"
 >8.6. Notes</A
 ></H1
 ><P
diff --git a/docs/htmldocs/appendixes.html b/docs/htmldocs/appendixes.html
index 19ad066fae..43df8c527a 100644
--- a/docs/htmldocs/appendixes.html
+++ b/docs/htmldocs/appendixes.html
@@ -13,8 +13,8 @@ REL="PREVIOUS"
 TITLE="Unicode/Charsets"
 HREF="unicode.html"><LINK
 REL="NEXT"
-TITLE="Samba performance issues"
-HREF="speed.html"></HEAD
+TITLE="SWAT - The Samba Web Admininistration Tool"
+HREF="swat.html"></HEAD
 ><BODY
 CLASS="PART"
 BGCOLOR="#FFFFFF"
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="speed.html"
+HREF="swat.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -83,101 +83,187 @@ CLASS="TOC"
 >Table of Contents</B
 ></DT
 ><DT
->23. <A
+>25. <A
+HREF="swat.html"
+>SWAT - The Samba Web Admininistration Tool</A
+></DT
+><DD
+><DL
+><DT
+>25.1. <A
+HREF="swat.html#AEN3976"
+>SWAT Features and Benefits</A
+></DT
+><DD
+><DL
+><DT
+>25.1.1. <A
+HREF="swat.html#AEN3979"
+>The SWAT Home Page</A
+></DT
+><DT
+>25.1.2. <A
+HREF="swat.html#AEN3982"
+>Global Settings</A
+></DT
+><DT
+>25.1.3. <A
+HREF="swat.html#AEN3985"
+>The SWAT Wizard</A
+></DT
+><DT
+>25.1.4. <A
+HREF="swat.html#AEN3988"
+>Share Settings</A
+></DT
+><DT
+>25.1.5. <A
+HREF="swat.html#AEN3991"
+>Printing Settings</A
+></DT
+><DT
+>25.1.6. <A
+HREF="swat.html#AEN3994"
+>The Status Page</A
+></DT
+><DT
+>25.1.7. <A
+HREF="swat.html#AEN3997"
+>The Password Change Page</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>26. <A
+HREF="nt4migration.html"
+>Migration from NT4 PDC to Samba-3 PDC</A
+></DT
+><DD
+><DL
+><DT
+>26.1. <A
+HREF="nt4migration.html#AEN4012"
+>Planning and Getting Started</A
+></DT
+><DD
+><DL
+><DT
+>26.1.1. <A
+HREF="nt4migration.html#AEN4015"
+>Objectives</A
+></DT
+><DT
+>26.1.2. <A
+HREF="nt4migration.html#AEN4018"
+>Steps In Migration Process</A
+></DT
+></DL
+></DD
+><DT
+>26.2. <A
+HREF="nt4migration.html#AEN4021"
+>Managing Samba-3 Domain Control</A
+></DT
+></DL
+></DD
+><DT
+>27. <A
 HREF="speed.html"
 >Samba performance issues</A
 ></DT
 ><DD
 ><DL
 ><DT
->23.1. <A
-HREF="speed.html#AEN3443"
+>27.1. <A
+HREF="speed.html#AEN4041"
 >Comparisons</A
 ></DT
 ><DT
->23.2. <A
-HREF="speed.html#AEN3449"
+>27.2. <A
+HREF="speed.html#AEN4047"
 >Socket options</A
 ></DT
 ><DT
->23.3. <A
-HREF="speed.html#AEN3456"
+>27.3. <A
+HREF="speed.html#AEN4054"
 >Read size</A
 ></DT
 ><DT
->23.4. <A
-HREF="speed.html#AEN3461"
+>27.4. <A
+HREF="speed.html#AEN4059"
 >Max xmit</A
 ></DT
 ><DT
->23.5. <A
-HREF="speed.html#AEN3466"
+>27.5. <A
+HREF="speed.html#AEN4064"
 >Log level</A
 ></DT
 ><DT
->23.6. <A
-HREF="speed.html#AEN3469"
+>27.6. <A
+HREF="speed.html#AEN4067"
 >Read raw</A
 ></DT
 ><DT
->23.7. <A
-HREF="speed.html#AEN3474"
+>27.7. <A
+HREF="speed.html#AEN4072"
 >Write raw</A
 ></DT
 ><DT
->23.8. <A
-HREF="speed.html#AEN3478"
+>27.8. <A
+HREF="speed.html#AEN4076"
 >Slow Clients</A
 ></DT
 ><DT
->23.9. <A
-HREF="speed.html#AEN3482"
+>27.9. <A
+HREF="speed.html#AEN4080"
 >Slow Logins</A
 ></DT
 ><DT
->23.10. <A
-HREF="speed.html#AEN3485"
+>27.10. <A
+HREF="speed.html#AEN4083"
 >Client tuning</A
 ></DT
 ></DL
 ></DD
 ><DT
->24. <A
+>28. <A
 HREF="portability.html"
 >Portability</A
 ></DT
 ><DD
 ><DL
 ><DT
->24.1. <A
-HREF="portability.html#AEN3525"
+>28.1. <A
+HREF="portability.html#AEN4127"
 >HPUX</A
 ></DT
 ><DT
->24.2. <A
-HREF="portability.html#AEN3531"
+>28.2. <A
+HREF="portability.html#AEN4133"
 >SCO Unix</A
 ></DT
 ><DT
->24.3. <A
-HREF="portability.html#AEN3535"
+>28.3. <A
+HREF="portability.html#AEN4137"
 >DNIX</A
 ></DT
 ><DT
->24.4. <A
-HREF="portability.html#AEN3564"
+>28.4. <A
+HREF="portability.html#AEN4166"
 >RedHat Linux Rembrandt-II</A
 ></DT
 ><DT
->24.5. <A
-HREF="portability.html#AEN3570"
+>28.5. <A
+HREF="portability.html#AEN4172"
 >AIX</A
 ></DT
 ><DD
 ><DL
 ><DT
->24.5.1. <A
-HREF="portability.html#AEN3572"
+>28.5.1. <A
+HREF="portability.html#AEN4174"
 >Sequential Read Ahead</A
 ></DT
 ></DL
@@ -185,156 +271,161 @@ HREF="portability.html#AEN3572"
 ></DL
 ></DD
 ><DT
->25. <A
+>29. <A
 HREF="other-clients.html"
 >Samba and other CIFS clients</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.1. <A
-HREF="other-clients.html#AEN3590"
+>29.1. <A
+HREF="other-clients.html#AEN4196"
 >Macintosh clients?</A
 ></DT
 ><DT
->25.2. <A
-HREF="other-clients.html#AEN3599"
+>29.2. <A
+HREF="other-clients.html#AEN4205"
 >OS2 Client</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.2.1. <A
-HREF="other-clients.html#AEN3601"
+>29.2.1. <A
+HREF="other-clients.html#AEN4207"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
->25.2.2. <A
-HREF="other-clients.html#AEN3616"
+>29.2.2. <A
+HREF="other-clients.html#AEN4222"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
->25.2.3. <A
-HREF="other-clients.html#AEN3625"
+>29.2.3. <A
+HREF="other-clients.html#AEN4231"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
->25.2.4. <A
-HREF="other-clients.html#AEN3629"
+>29.2.4. <A
+HREF="other-clients.html#AEN4235"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
 ></DL
 ></DD
 ><DT
->25.3. <A
-HREF="other-clients.html#AEN3639"
+>29.3. <A
+HREF="other-clients.html#AEN4245"
 >Windows for Workgroups</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.3.1. <A
-HREF="other-clients.html#AEN3641"
+>29.3.1. <A
+HREF="other-clients.html#AEN4247"
 >Use latest TCP/IP stack from Microsoft</A
 ></DT
 ><DT
->25.3.2. <A
-HREF="other-clients.html#AEN3646"
+>29.3.2. <A
+HREF="other-clients.html#AEN4252"
 >Delete .pwl files after password change</A
 ></DT
 ><DT
->25.3.3. <A
-HREF="other-clients.html#AEN3651"
+>29.3.3. <A
+HREF="other-clients.html#AEN4257"
 >Configure WfW password handling</A
 ></DT
 ><DT
->25.3.4. <A
-HREF="other-clients.html#AEN3655"
+>29.3.4. <A
+HREF="other-clients.html#AEN4261"
 >Case handling of passwords</A
 ></DT
 ><DT
->25.3.5. <A
-HREF="other-clients.html#AEN3660"
+>29.3.5. <A
+HREF="other-clients.html#AEN4266"
 >Use TCP/IP as default protocol</A
 ></DT
 ></DL
 ></DD
 ><DT
->25.4. <A
-HREF="other-clients.html#AEN3663"
+>29.4. <A
+HREF="other-clients.html#AEN4269"
 >Windows '95/'98</A
 ></DT
 ><DT
->25.5. <A
-HREF="other-clients.html#AEN3679"
+>29.5. <A
+HREF="other-clients.html#AEN4285"
 >Windows 2000 Service Pack 2</A
 ></DT
+><DT
+>29.6. <A
+HREF="other-clients.html#AEN4302"
+>Windows NT 3.1</A
+></DT
 ></DL
 ></DD
 ><DT
->26. <A
+>30. <A
 HREF="compiling.html"
 >How to compile SAMBA</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.1. <A
-HREF="compiling.html#AEN3706"
+>30.1. <A
+HREF="compiling.html#AEN4323"
 >Access Samba source code via CVS</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.1.1. <A
-HREF="compiling.html#AEN3708"
+>30.1.1. <A
+HREF="compiling.html#AEN4325"
 >Introduction</A
 ></DT
 ><DT
->26.1.2. <A
-HREF="compiling.html#AEN3713"
+>30.1.2. <A
+HREF="compiling.html#AEN4330"
 >CVS Access to samba.org</A
 ></DT
 ></DL
 ></DD
 ><DT
->26.2. <A
-HREF="compiling.html#AEN3749"
+>30.2. <A
+HREF="compiling.html#AEN4366"
 >Accessing the samba sources via rsync and ftp</A
 ></DT
 ><DT
->26.3. <A
-HREF="compiling.html#AEN3755"
+>30.3. <A
+HREF="compiling.html#AEN4372"
 >Building the Binaries</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.3.1. <A
-HREF="compiling.html#AEN3783"
+>30.3.1. <A
+HREF="compiling.html#AEN4400"
 >Compiling samba with Active Directory support</A
 ></DT
 ></DL
 ></DD
 ><DT
->26.4. <A
-HREF="compiling.html#AEN3812"
+>30.4. <A
+HREF="compiling.html#AEN4429"
 >Starting the smbd and nmbd</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.4.1. <A
-HREF="compiling.html#AEN3822"
+>30.4.1. <A
+HREF="compiling.html#AEN4439"
 >Starting from inetd.conf</A
 ></DT
 ><DT
->26.4.2. <A
-HREF="compiling.html#AEN3851"
+>30.4.2. <A
+HREF="compiling.html#AEN4469"
 >Alternative: starting it as a daemon</A
 ></DT
 ></DL
@@ -342,128 +433,69 @@ HREF="compiling.html#AEN3851"
 ></DL
 ></DD
 ><DT
->27. <A
+>31. <A
 HREF="bugreport.html"
 >Reporting Bugs</A
 ></DT
 ><DD
 ><DL
 ><DT
->27.1. <A
-HREF="bugreport.html#AEN3874"
+>31.1. <A
+HREF="bugreport.html#AEN4500"
 >Introduction</A
 ></DT
 ><DT
->27.2. <A
-HREF="bugreport.html#AEN3884"
+>31.2. <A
+HREF="bugreport.html#AEN4510"
 >General info</A
 ></DT
 ><DT
->27.3. <A
-HREF="bugreport.html#AEN3890"
+>31.3. <A
+HREF="bugreport.html#AEN4516"
 >Debug levels</A
 ></DT
 ><DT
->27.4. <A
-HREF="bugreport.html#AEN3907"
+>31.4. <A
+HREF="bugreport.html#AEN4536"
 >Internal errors</A
 ></DT
 ><DT
->27.5. <A
-HREF="bugreport.html#AEN3917"
+>31.5. <A
+HREF="bugreport.html#AEN4550"
 >Attaching to a running process</A
 ></DT
 ><DT
->27.6. <A
-HREF="bugreport.html#AEN3920"
+>31.6. <A
+HREF="bugreport.html#AEN4558"
 >Patches</A
 ></DT
 ></DL
 ></DD
 ><DT
->28. <A
+>32. <A
 HREF="diagnosis.html"
 >The samba checklist</A
 ></DT
 ><DD
 ><DL
 ><DT
->28.1. <A
-HREF="diagnosis.html#AEN3943"
+>32.1. <A
+HREF="diagnosis.html#AEN4581"
 >Introduction</A
 ></DT
 ><DT
->28.2. <A
-HREF="diagnosis.html#AEN3948"
+>32.2. <A
+HREF="diagnosis.html#AEN4586"
 >Assumptions</A
 ></DT
 ><DT
->28.3. <A
-HREF="diagnosis.html#AEN3958"
->Tests</A
-></DT
-><DD
-><DL
-><DT
->28.3.1. <A
-HREF="diagnosis.html#AEN3960"
->Test 1</A
-></DT
-><DT
->28.3.2. <A
-HREF="diagnosis.html#AEN3966"
->Test 2</A
-></DT
-><DT
->28.3.3. <A
-HREF="diagnosis.html#AEN3972"
->Test 3</A
-></DT
-><DT
->28.3.4. <A
-HREF="diagnosis.html#AEN3987"
->Test 4</A
-></DT
-><DT
->28.3.5. <A
-HREF="diagnosis.html#AEN3992"
->Test 5</A
-></DT
-><DT
->28.3.6. <A
-HREF="diagnosis.html#AEN3998"
->Test 6</A
+>32.3. <A
+HREF="diagnosis.html#AEN4596"
+>The tests</A
 ></DT
 ><DT
->28.3.7. <A
-HREF="diagnosis.html#AEN4006"
->Test 7</A
-></DT
-><DT
->28.3.8. <A
-HREF="diagnosis.html#AEN4032"
->Test 8</A
-></DT
-><DT
->28.3.9. <A
-HREF="diagnosis.html#AEN4049"
->Test 9</A
-></DT
-><DT
->28.3.10. <A
-HREF="diagnosis.html#AEN4057"
->Test 10</A
-></DT
-><DT
->28.3.11. <A
-HREF="diagnosis.html#AEN4063"
->Test 11</A
-></DT
-></DL
-></DD
-><DT
->28.4. <A
-HREF="diagnosis.html#AEN4068"
+>32.4. <A
+HREF="diagnosis.html#AEN4697"
 >Still having troubles?</A
 ></DT
 ></DL
@@ -506,7 +538,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="speed.html"
+HREF="swat.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -526,7 +558,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Samba performance issues</TD
+>SWAT - The Samba Web Admininistration Tool</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/browsing-quick.html b/docs/htmldocs/browsing-quick.html
index 18be543aa4..9519e8808e 100644
--- a/docs/htmldocs/browsing-quick.html
+++ b/docs/htmldocs/browsing-quick.html
@@ -81,15 +81,39 @@ be taken as the fast track guide to implementing browsing across subnets
 and / or across workgroups (or domains). WINS is the best tool for resolution
 of NetBIOS names to IP addesses. WINS is NOT involved in browse list handling
 except by way of name to address mapping.</P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
 ><P
->Note: MS Windows 2000 and later can be configured to operate with NO NetBIOS 
+>MS Windows 2000 and later can be configured to operate with NO NetBIOS 
 over TCP/IP. Samba-3 and later also supports this mode of operation.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN130"
+NAME="AEN174"
 >2.1. Discussion</A
 ></H1
 ><P
@@ -101,29 +125,63 @@ messaging to affect browse list management. When running NetBIOS over
 TCP/IP this uses UDP based messaging. UDP messages can be broadcast or unicast.</P
 ><P
 >Normally, only unicast UDP messaging can be forwarded by routers. The
-"remote announce" parameter to smb.conf helps to project browse announcements
-to remote network segments via unicast UDP. Similarly, the "remote browse sync"
-parameter of smb.conf implements browse list collation using unicast UDP.</P
+<B
+CLASS="COMMAND"
+>remote announce</B
+>
+parameter to smb.conf helps to project browse announcements
+to remote network segments via unicast UDP. Similarly, the 
+<B
+CLASS="COMMAND"
+>remote browse sync</B
+> parameter of <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>
+implements browse list collation using unicast UDP.</P
 ><P
 >Secondly, in those networks where Samba is the only SMB server technology
 wherever possible nmbd should be configured on one (1) machine as the WINS
 server. This makes it easy to manage the browsing environment. If each network
 segment is configured with it's own Samba WINS server, then the only way to
-get cross segment browsing to work is by using the "remote announce" and
-the "remote browse sync" parameters to your smb.conf file.</P
+get cross segment browsing to work is by using the 
+<B
+CLASS="COMMAND"
+>remote announce</B
+> and the <B
+CLASS="COMMAND"
+>remote browse sync</B
+>
+parameters to your <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file.</P
 ><P
 >If only one WINS server is used for an entire multi-segment network then
-the use of the "remote announce" and the "remote browse sync" parameters
-should NOT be necessary.</P
-><P
->As of Samba-3 WINS replication is being worked on. The bulk of the code has
+the use of the <B
+CLASS="COMMAND"
+>remote announce</B
+> and the 
+<B
+CLASS="COMMAND"
+>remote browse sync</B
+> parameters should NOT be necessary.</P
+><P
+>As of Samba 3 WINS replication is being worked on. The bulk of the code has
 been committed, but it still needs maturation.</P
 ><P
 >Right now samba WINS does not support MS-WINS replication. This means that
 when setting up Samba as a WINS server there must only be one nmbd configured
 as a WINS server on the network. Some sites have used multiple Samba WINS
-servers for redundancy (one server per subnet) and then used "remote browse
-sync" and "remote announce" to affect browse list collation across all
+servers for redundancy (one server per subnet) and then used 
+<B
+CLASS="COMMAND"
+>remote browse sync</B
+> and <B
+CLASS="COMMAND"
+>remote announce</B
+>
+to affect browse list collation across all
 segments. Note that this means clients will only resolve local names,
 and must be configured to use DNS to resolve names on other subnets in
 order to resolve the IP addresses of the servers they can see on other
@@ -140,7 +198,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN139"
+NAME="AEN193"
 >2.2. How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></H1
@@ -157,7 +215,11 @@ well as name lookups are done by UDP broadcast. This isolates name
 resolution to the local subnet, unless LMHOSTS is used to list all 
 names and IP addresses. In such situations Samba provides a means by 
 which the samba server name may be forcibly injected into the browse 
-list of a remote MS Windows network (using the "remote announce" parameter).</P
+list of a remote MS Windows network (using the 
+<B
+CLASS="COMMAND"
+>remote announce</B
+> parameter).</P
 ><P
 >Where a WINS server is used, the MS Windows client will use UDP 
 unicast to register with the WINS server. Such packets can be routed 
@@ -185,14 +247,23 @@ will annoy users because they will have to put up with protracted
 inability to use the network services.</P
 ><P
 >Samba supports a feature that allows forced synchonisation 
-of browse lists across routed networks using the "remote 
-browse sync" parameter in the smb.conf file. This causes Samba 
-to contact the local master browser on a remote network and 
+of browse lists across routed networks using the <B
+CLASS="COMMAND"
+>remote 
+browse sync</B
+> parameter in the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file. 
+This causes Samba to contact the local master browser on a remote network and 
 to request browse list synchronisation. This effectively bridges 
 two networks that are separated by routers. The two remote 
 networks may use either broadcast based name resolution or WINS 
-based name resolution, but it should be noted that the "remote 
-browse sync" parameter provides browse list synchronisation - and 
+based name resolution, but it should be noted that the <B
+CLASS="COMMAND"
+>remote 
+browse sync</B
+> parameter provides browse list synchronisation - and 
 that is distinct from name to address resolution, in other 
 words, for cross subnet browsing to function correctly it is 
 essential that a name to address resolution mechanism be provided. 
@@ -207,21 +278,40 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN149"
->2.3. Use of the "Remote Announce" parameter</A
+NAME="AEN207"
+>2.3. Use of the <B
+CLASS="COMMAND"
+>Remote Announce</B
+> parameter</A
 ></H1
 ><P
->The "remote announce" parameter of smb.conf can be used to forcibly ensure
+>The <B
+CLASS="COMMAND"
+>remote announce</B
+> parameter of 
+<TT
+CLASS="FILENAME"
+>smb.conf</TT
+> can be used to forcibly ensure
 that all the NetBIOS names on a network get announced to a remote network.
-The syntax of the "remote announce" parameter is:
+The syntax of the <B
+CLASS="COMMAND"
+>remote announce</B
+> parameter is:
 <PRE
 CLASS="PROGRAMLISTING"
->	remote announce = a.b.c.d [e.f.g.h] ...</PRE
+>	remote announce = <VAR
+CLASS="REPLACEABLE"
+>a.b.c.d [e.f.g.h]</VAR
+> ...</PRE
 >
 _or_
 <PRE
 CLASS="PROGRAMLISTING"
->	remote announce = a.b.c.d/WORKGROUP [e.f.g.h/WORKGROUP] ...</PRE
+>	remote announce = <VAR
+CLASS="REPLACEABLE"
+>a.b.c.d/WORKGROUP [e.f.g.h/WORKGROUP]</VAR
+> ...</PRE
 >
 
 where:
@@ -231,7 +321,14 @@ where:
 CLASS="VARIABLELIST"
 ><DL
 ><DT
->a.b.c.d and e.f.g.h</DT
+><VAR
+CLASS="REPLACEABLE"
+>a.b.c.d</VAR
+> and 
+<VAR
+CLASS="REPLACEABLE"
+>e.f.g.h</VAR
+></DT
 ><DD
 ><P
 >is either the LMB (Local Master Browser) IP address
@@ -246,7 +343,10 @@ undesirable but may be necessary if we do NOT know
 the IP address of the remote LMB.</P
 ></DD
 ><DT
->WORKGROUP</DT
+><VAR
+CLASS="REPLACEABLE"
+>WORKGROUP</VAR
+></DT
 ><DD
 ><P
 >is optional and can be either our own workgroup
@@ -265,30 +365,49 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN163"
->2.4. Use of the "Remote Browse Sync" parameter</A
+NAME="AEN230"
+>2.4. Use of the <B
+CLASS="COMMAND"
+>Remote Browse Sync</B
+> parameter</A
 ></H1
 ><P
->The "remote browse sync" parameter of smb.conf is used to announce to
+>The <B
+CLASS="COMMAND"
+>remote browse sync</B
+> parameter of 
+<TT
+CLASS="FILENAME"
+>smb.conf</TT
+> is used to announce to
 another LMB that it must synchronise it's NetBIOS name list with our
 Samba LMB. It works ONLY if the Samba server that has this option is
 simultaneously the LMB on it's network segment.</P
 ><P
->The syntax of the "remote browse  sync" parameter is:
+>The syntax of the <B
+CLASS="COMMAND"
+>remote browse sync</B
+> parameter is:
 
 <PRE
 CLASS="PROGRAMLISTING"
->remote browse sync = a.b.c.d</PRE
+>remote browse sync = <VAR
+CLASS="REPLACEABLE"
+>a.b.c.d</VAR
+></PRE
 >
 
-where a.b.c.d is either the IP address of the remote LMB or else is the network broadcast address of the remote segment.</P
+where <VAR
+CLASS="REPLACEABLE"
+>a.b.c.d</VAR
+> is either the IP address of the remote LMB or else is the network broadcast address of the remote segment.</P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN168"
+NAME="AEN241"
 >2.5. Use of WINS</A
 ></H1
 ><P
@@ -312,7 +431,11 @@ of all names that have registered the NetLogon service name_type. This saves
 broadcast traffic and greatly expedites logon processing. Since broadcast
 name resolution can not be used across network segments this type of
 information can only be provided via WINS _or_ via statically configured
-"lmhosts" files that must reside on all clients in the absence of WINS.</P
+<TT
+CLASS="FILENAME"
+>lmhosts</TT
+> files that must reside on all clients in the
+absence of WINS.</P
 ><P
 >WINS also serves the purpose of forcing browse list synchronisation by all
 LMB's. LMB's must synchronise their browse list with the DMB (domain master
@@ -330,8 +453,15 @@ machines that have not registered with a WINS server will fail name to address
 lookup attempts by other clients and will therefore cause workstation access
 errors.</P
 ><P
->To configure Samba as a WINS server just add "wins support = yes" to the
-smb.conf file [globals] section.</P
+>To configure Samba as a WINS server just add 
+<B
+CLASS="COMMAND"
+>wins support = yes</B
+> to the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>
+file [globals] section.</P
 ><P
 >To configure Samba to register with a WINS server just add
 "wins server = a.b.c.d" to your smb.conf file [globals] section.</P
@@ -351,7 +481,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN179"
+NAME="AEN255"
 >2.6. Do NOT use more than one (1) protocol on MS Windows machines</A
 ></H1
 ><P
@@ -394,7 +524,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN187"
+NAME="AEN263"
 >2.7. Name Resolution Order</A
 ></H1
 ><P
diff --git a/docs/htmldocs/bugreport.html b/docs/htmldocs/bugreport.html
index 0711f00f80..2ba74f5192 100644
--- a/docs/htmldocs/bugreport.html
+++ b/docs/htmldocs/bugreport.html
@@ -74,18 +74,18 @@ CLASS="CHAPTER"
 ><A
 NAME="BUGREPORT"
 ></A
->Chapter 27. Reporting Bugs</H1
+>Chapter 31. Reporting Bugs</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3874"
->27.1. Introduction</A
+NAME="AEN4500"
+>31.1. Introduction</A
 ></H1
 ><P
 >The email address for bug reports for stable releases is <A
-HREF="samba@samba.org"
+HREF="mailto:samba@samba.org"
 TARGET="_top"
 >samba@samba.org</A
 >. 
@@ -125,8 +125,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3884"
->27.2. General info</A
+NAME="AEN4510"
+>31.2. General info</A
 ></H1
 ><P
 >Before submitting a bug report check your config for silly
@@ -135,8 +135,7 @@ you've misconfigured something and run testparm to test your config
 file for correct syntax.</P
 ><P
 >Have you run through the <A
-HREF="Diagnosis.html"
-TARGET="_top"
+HREF="diagnosis.html"
 >diagnosis</A
 >? 
 This is very important.</P
@@ -150,8 +149,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3890"
->27.3. Debug levels</A
+NAME="AEN4516"
+>31.3. Debug levels</A
 ></H1
 ><P
 >If the bug has anything to do with Samba behaving incorrectly as a
@@ -181,9 +180,15 @@ include = /usr/local/samba/lib/smb.conf.%m</PRE
 >then create a file 
 <TT
 CLASS="FILENAME"
->/usr/local/samba/lib/smb.conf.machine</TT
+>/usr/local/samba/lib/smb.conf.<VAR
+CLASS="REPLACEABLE"
+>machine</VAR
+></TT
 > where
-"machine" is the name of the client you wish to debug. In that file
+<VAR
+CLASS="REPLACEABLE"
+>machine</VAR
+> is the name of the client you wish to debug. In that file
 put any smb.conf commands you want, for example 
 <B
 CLASS="COMMAND"
@@ -204,7 +209,10 @@ CLASS="COMMAND"
 >debuglevel =</B
 > that has been 
 used in older versions of Samba and is being retained for backwards 
-compatibility of smb.conf files.</P
+compatibility of <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> files.</P
 ><P
 >As the <B
 CLASS="COMMAND"
@@ -220,14 +228,14 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3907"
->27.4. Internal errors</A
+NAME="AEN4536"
+>31.4. Internal errors</A
 ></H1
 ><P
 >If you get a "INTERNAL ERROR" message in your log files it means that
 Samba got an unexpected signal while running. It is probably a
 segmentation fault and almost certainly means a bug in Samba (unless
-you have faulty hardware or system software)</P
+you have faulty hardware or system software).</P
 ><P
 >If the message came from smbd then it will probably be accompanied by
 a message which details the last SMB message received by smbd. This
@@ -237,7 +245,10 @@ include it in your bug report.</P
 >You should also detail how to reproduce the problem, if
 possible. Please make this reasonably detailed.</P
 ><P
->You may also find that a core file appeared in a "corefiles"
+>You may also find that a core file appeared in a <TT
+CLASS="FILENAME"
+>corefiles</TT
+>
 subdirectory of the directory where you keep your samba log
 files. This file is the most useful tool for tracking down the bug. To
 use it you do this:</P
@@ -248,11 +259,20 @@ CLASS="COMMAND"
 ></P
 ><P
 >adding appropriate paths to smbd and core so gdb can find them. If you
-don't have gdb then try "dbx". Then within the debugger use the
-command "where" to give a stack trace of where the problem
+don't have gdb then try <KBD
+CLASS="USERINPUT"
+>dbx</KBD
+>. Then within the debugger use the
+command <KBD
+CLASS="USERINPUT"
+>where</KBD
+> to give a stack trace of where the problem
 occurred. Include this in your mail.</P
 ><P
->If you known any assembly language then do a "disass" of the routine
+>If you known any assembly language then do a <KBD
+CLASS="USERINPUT"
+>disass</KBD
+> of the routine
 where the problem occurred (if its in a library routine then
 disassemble the routine that called it) and try to work out exactly
 where the problem is by looking at the surrounding code. Even if you
@@ -264,15 +284,30 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3917"
->27.5. Attaching to a running process</A
+NAME="AEN4550"
+>31.5. Attaching to a running process</A
 ></H1
 ><P
 >Unfortunately some unixes (in particular some recent linux kernels)
 refuse to dump a core file if the task has changed uid (which smbd
 does often). To debug with this sort of system you could try to attach
-to the running process using "gdb smbd PID" where you get PID from
-smbstatus. Then use "c" to continue and try to cause the core dump
+to the running process using <KBD
+CLASS="USERINPUT"
+>gdb smbd <VAR
+CLASS="REPLACEABLE"
+>PID</VAR
+></KBD
+> where you get <VAR
+CLASS="REPLACEABLE"
+>PID</VAR
+> from
+<SPAN
+CLASS="APPLICATION"
+>smbstatus</SPAN
+>. Then use <KBD
+CLASS="USERINPUT"
+>c</KBD
+> to continue and try to cause the core dump
 using the client. The debugger should catch the fault and tell you
 where it occurred.</P
 ></DIV
@@ -281,18 +316,18 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3920"
->27.6. Patches</A
+NAME="AEN4558"
+>31.6. Patches</A
 ></H1
 ><P
 >The best sort of bug report is one that includes a fix! If you send us
-patches please use <B
-CLASS="COMMAND"
->diff -u</B
+patches please use <KBD
+CLASS="USERINPUT"
+>diff -u</KBD
 > format if your version of 
-diff supports it, otherwise use <B
-CLASS="COMMAND"
->diff -c4</B
+diff supports it, otherwise use <KBD
+CLASS="USERINPUT"
+>diff -c4</KBD
 >. Make sure 
 your do the diff against a clean version of the source and let me know 
 exactly what version you used. </P
diff --git a/docs/htmldocs/compiling.html b/docs/htmldocs/compiling.html
index f62bc5400e..c336b388ba 100644
--- a/docs/htmldocs/compiling.html
+++ b/docs/htmldocs/compiling.html
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="COMPILING"
 ></A
->Chapter 26. How to compile SAMBA</H1
+>Chapter 30. How to compile SAMBA</H1
 ><P
 >You can obtain the samba source from the <A
 HREF="http://samba.org/"
@@ -87,16 +87,16 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3706"
->26.1. Access Samba source code via CVS</A
+NAME="AEN4323"
+>30.1. Access Samba source code via CVS</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3708"
->26.1.1. Introduction</A
+NAME="AEN4325"
+>30.1.1. Introduction</A
 ></H2
 ><P
 >Samba is developed in an open environment.  Developers use CVS
@@ -117,8 +117,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3713"
->26.1.2. CVS Access to samba.org</A
+NAME="AEN4330"
+>30.1.2. CVS Access to samba.org</A
 ></H2
 ><P
 >The machine samba.org runs a publicly accessible CVS 
@@ -130,8 +130,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3716"
->26.1.2.1. Access via CVSweb</A
+NAME="AEN4333"
+>30.1.2.1. Access via CVSweb</A
 ></H3
 ><P
 >You can access the source code via your 
@@ -151,8 +151,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3721"
->26.1.2.2. Access via cvs</A
+NAME="AEN4338"
+>30.1.2.2. Access via cvs</A
 ></H3
 ><P
 >You can also access the source code via a 
@@ -192,9 +192,9 @@ TYPE="1"
 >	Run the command 
 	</P
 ><P
->	<B
-CLASS="COMMAND"
->cvs -d :pserver:cvs@samba.org:/cvsroot login</B
+>	<KBD
+CLASS="USERINPUT"
+>cvs -d :pserver:cvs@samba.org:/cvsroot login</KBD
 >
 	</P
 ><P
@@ -209,9 +209,9 @@ CLASS="USERINPUT"
 >	Run the command 
 	</P
 ><P
->	<B
-CLASS="COMMAND"
->cvs -d :pserver:cvs@samba.org:/cvsroot co samba</B
+>	<KBD
+CLASS="USERINPUT"
+>cvs -d :pserver:cvs@samba.org:/cvsroot co samba</KBD
 >
 	</P
 ><P
@@ -226,12 +226,12 @@ CLASS="PARAMETER"
 >
 	and defining a tag name.  A list of branch tag names can be found on the
 	"Development" page of the samba web site.  A common request is to obtain the
-	latest 2.2 release code.  This could be done by using the following command.
+	latest 2.2 release code.  This could be done by using the following userinput.
 	</P
 ><P
->	<B
-CLASS="COMMAND"
->cvs -d :pserver:cvs@samba.org:/cvsroot co -r SAMBA_2_2 samba</B
+>	<KBD
+CLASS="USERINPUT"
+>cvs -d :pserver:cvs@samba.org:/cvsroot co -r SAMBA_2_2 samba</KBD
 >
 	</P
 ></LI
@@ -241,9 +241,9 @@ CLASS="COMMAND"
 	the following command from within the samba directory: 
 	</P
 ><P
->	<B
-CLASS="COMMAND"
->cvs update -d -P</B
+>	<KBD
+CLASS="USERINPUT"
+>cvs update -d -P</KBD
 >
 	</P
 ></LI
@@ -256,8 +256,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3749"
->26.2. Accessing the samba sources via rsync and ftp</A
+NAME="AEN4366"
+>30.2. Accessing the samba sources via rsync and ftp</A
 ></H1
 ><P
 >	pserver.samba.org also exports unpacked copies of most parts of the CVS tree at <A
@@ -284,14 +284,14 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3755"
->26.3. Building the Binaries</A
+NAME="AEN4372"
+>30.3. Building the Binaries</A
 ></H1
 ><P
->To do this, first run the program <B
-CLASS="COMMAND"
+>To do this, first run the program <KBD
+CLASS="USERINPUT"
 >./configure
-	</B
+	</KBD
 > in the source directory. This should automatically 
 	configure Samba for your operating system. If you have unusual 
 	needs then you may wish to run</P
@@ -370,8 +370,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3783"
->26.3.1. Compiling samba with Active Directory support</A
+NAME="AEN4400"
+>30.3.1. Compiling samba with Active Directory support</A
 ></H2
 ><P
 >In order to compile samba with ADS support, you need to have installed
@@ -420,8 +420,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3795"
->26.3.1.1. Installing the required packages for Debian</A
+NAME="AEN4412"
+>30.3.1.1. Installing the required packages for Debian</A
 ></H3
 ><P
 >On Debian you need to install the following packages:</P
@@ -451,8 +451,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3802"
->26.3.1.2. Installing the required packages for RedHat</A
+NAME="AEN4419"
+>30.3.1.2. Installing the required packages for RedHat</A
 ></H3
 ><P
 >On RedHat this means you should have at least: </P
@@ -493,22 +493,22 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3812"
->26.4. Starting the smbd and nmbd</A
+NAME="AEN4429"
+>30.4. Starting the smbd and nmbd</A
 ></H1
 ><P
 >You must choose to start smbd and nmbd either
-	as daemons or from <B
-CLASS="COMMAND"
->inetd</B
->. Don't try
+	as daemons or from <SPAN
+CLASS="APPLICATION"
+>inetd</SPAN
+>Don't try
 	to do both!  Either you can put them in <TT
 CLASS="FILENAME"
 >	inetd.conf</TT
 > and have them started on demand
-	by <B
-CLASS="COMMAND"
->inetd</B
+	by <SPAN
+CLASS="APPLICATION"
+>inetd</SPAN
 >, or you can start them as
 	daemons either from the command line or in <TT
 CLASS="FILENAME"
@@ -518,13 +518,13 @@ CLASS="FILENAME"
 	the bit about what user you need to be in order to start
 	Samba.  In many cases you must be root.</P
 ><P
->The main advantage of starting <B
-CLASS="COMMAND"
->smbd</B
+>The main advantage of starting <SPAN
+CLASS="APPLICATION"
+>smbd</SPAN
 >
-	and <B
-CLASS="COMMAND"
->nmbd</B
+	and <SPAN
+CLASS="APPLICATION"
+>nmbd</SPAN
 > using the recommended daemon method
 	is that they will respond slightly more quickly to an initial connection
 	request.</P
@@ -533,8 +533,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3822"
->26.4.1. Starting from inetd.conf</A
+NAME="AEN4439"
+>30.4.1. Starting from inetd.conf</A
 ></H2
 ><P
 >NOTE; The following will be different if 
@@ -595,19 +595,39 @@ CLASS="FILENAME"
 ><P
 >NOTE: On many systems you may need to use the 
 		"interfaces" option in smb.conf to specify the IP address 
-		and netmask of your interfaces. Run <B
-CLASS="COMMAND"
->ifconfig</B
+		and netmask of your interfaces. Run <SPAN
+CLASS="APPLICATION"
+>ifconfig</SPAN
 > 
 		as root if you don't know what the broadcast is for your
-		net. <B
-CLASS="COMMAND"
->nmbd</B
+		net. <SPAN
+CLASS="APPLICATION"
+>nmbd</SPAN
 > tries to determine it at run 
-		time, but fails on some unixes. See the section on "testing nmbd" 
-		for a method of finding if you need to do this.</P
+		time, but fails on some unixes. 
+		</P
+><DIV
+CLASS="WARNING"
+><P
+></P
+><TABLE
+CLASS="WARNING"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/warning.gif"
+HSPACE="5"
+ALT="Warning"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
 ><P
->!!!WARNING!!! Many unixes only accept around 5 
+>Many unixes only accept around 5 
 		parameters on the command line in <TT
 CLASS="FILENAME"
 >inetd.conf</TT
@@ -618,14 +638,18 @@ CLASS="FILENAME"
 CLASS="COMMAND"
 >inetd</B
 >.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >Restart <B
 CLASS="COMMAND"
 >inetd</B
 >, perhaps just send 
-		it a HUP. If you have installed an earlier version of <B
-CLASS="COMMAND"
->		nmbd</B
+		it a HUP. If you have installed an earlier version of <SPAN
+CLASS="APPLICATION"
+>		nmbd</SPAN
 > then you may need to kill nmbd as well.</P
 ></DIV
 ><DIV
@@ -633,8 +657,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3851"
->26.4.2. Alternative: starting it as a daemon</A
+NAME="AEN4469"
+>30.4.2. Alternative: starting it as a daemon</A
 ></H2
 ><P
 >To start the server as a daemon you should create 
@@ -676,13 +700,37 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >smbd</B
 >.</P
+><DIV
+CLASS="NOTE"
 ><P
->NOTE: If you use the SVR4 style init system then 
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>If you use the SVR4 style init system then 
 		you may like to look at the <TT
 CLASS="FILENAME"
 >examples/svr4-startup</TT
 >
 		script to make Samba fit into that system.</P
+></TD
+></TR
+></TABLE
+></DIV
 ></DIV
 ></DIV
 ></DIV
diff --git a/docs/htmldocs/diagnosis.html b/docs/htmldocs/diagnosis.html
index 070bc0562a..69edc6f0bf 100644
--- a/docs/htmldocs/diagnosis.html
+++ b/docs/htmldocs/diagnosis.html
@@ -67,14 +67,14 @@ CLASS="CHAPTER"
 ><A
 NAME="DIAGNOSIS"
 ></A
->Chapter 28. The samba checklist</H1
+>Chapter 32. The samba checklist</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3943"
->28.1. Introduction</A
+NAME="AEN4581"
+>32.1. Introduction</A
 ></H1
 ><P
 >This file contains a list of tests you can perform to validate your
@@ -95,8 +95,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3948"
->28.2. Assumptions</A
+NAME="AEN4586"
+>32.2. Assumptions</A
 ></H1
 ><P
 >In all of the tests it is assumed you have a Samba server called 
@@ -133,17 +133,18 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3958"
->28.3. Tests</A
+NAME="AEN4596"
+>32.3. The tests</A
 ></H1
 ><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3960"
->28.3.1. Test 1</A
-></H2
+CLASS="PROCEDURE"
+><P
+><B
+>Diagnosing your samba server</B
+></P
+><OL
+TYPE="1"
+><LI
 ><P
 >In the directory in which you store your smb.conf file, run the command
 "testparm smb.conf". If it reports any errors then your smb.conf
@@ -157,15 +158,8 @@ CLASS="FILENAME"
 CLASS="FILENAME"
 >/usr/local/samba/lib</TT
 ></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3966"
->28.3.2. Test 2</A
-></H2
+></LI
+><LI
 ><P
 >Run the command "ping BIGSERVER" from the PC and "ping ACLIENT" from
 the unix box. If you don't get a valid response then your TCP/IP
@@ -183,15 +177,8 @@ you do have correct entries for the remainder of these tests. </P
 software. You will need to relax the rules to let in the workstation
 in question, perhaps by allowing access from another subnet (on Linux
 this is done via the ipfwadm program.)</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3972"
->28.3.3. Test 3</A
-></H2
+></LI
+><LI
 ><P
 >Run the command "smbclient -L BIGSERVER" on the unix box. You
 should get a list of available shares back. </P
@@ -254,15 +241,8 @@ to start smbd as a daemon, it can avoid a lot of frustration!</P
 and / or broadcast address settings are incorrect. Please check that the
 network interface IP Address / Broadcast Address / Subnet Mask settings are
 correct and that Samba has correctly noted these in the log.nmb file.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3987"
->28.3.4. Test 4</A
-></H2
+></LI
+><LI
 ><P
 >Run the command "nmblookup -B BIGSERVER __SAMBA__". You should get the
 IP address of your Samba server back.</P
@@ -275,15 +255,8 @@ to udp port 137.</P
 parameters on the command line. If this is the case then create a
 one-line script that contains the right parameters and run that from
 inetd.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3992"
->28.3.5. Test 5</A
-></H2
+></LI
+><LI
 ><P
 >run the command <B
 CLASS="COMMAND"
@@ -296,15 +269,8 @@ got the name of the PC wrong. </P
 ><P
 >If ACLIENT doesn't resolve via DNS then use the IP address of the
 client in the above test.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3998"
->28.3.6. Test 6</A
-></H2
+></LI
+><LI
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -330,15 +296,8 @@ subnet.</P
 ><P
 >This test will probably fail if your subnet mask and broadcast address are
 not correct. (Refer to TEST 3 notes above).</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN4006"
->28.3.7. Test 7</A
-></H2
+></LI
+><LI
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -419,15 +378,8 @@ when you type <B
 CLASS="COMMAND"
 >dir</B
 >.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN4032"
->28.3.8. Test 8</A
-></H2
+></LI
+><LI
 ><P
 >On the PC type the command <B
 CLASS="COMMAND"
@@ -479,15 +431,8 @@ name and password.</P
 it probably means that the host is not contactable via tcp services.
 Check to see if the host is running tcp wrappers, and if so add an entry in
 the hosts.allow file for your client (or subnet, etc.)</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN4049"
->28.3.9. Test 9</A
-></H2
+></LI
+><LI
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -513,15 +458,8 @@ CLASS="FILENAME"
 >smb.conf</TT
 >.
 Turn it back on to fix.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN4057"
->28.3.10. Test 10</A
-></H2
+></LI
+><LI
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -539,15 +477,8 @@ CLASS="COMMAND"
 >preferred master = yes</B
 > to ensure that 
 an election is held at startup.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN4063"
->28.3.11. Test 11</A
-></H2
+></LI
+><LI
 ><P
 >From file manager try to browse the server. Your samba server should
 appear in the browse list of your local workgroup (or the one you
@@ -566,6 +497,8 @@ CLASS="COMMAND"
 > in your
 smb.conf file, or enable encrypted passwords AFTER compiling in support
 for encrypted passwords (refer to the Makefile).</P
+></LI
+></OL
 ></DIV
 ></DIV
 ><DIV
@@ -573,8 +506,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN4068"
->28.4. Still having troubles?</A
+NAME="AEN4697"
+>32.4. Still having troubles?</A
 ></H1
 ><P
 >Try the mailing list or newsgroup, or use the ethereal utility to
@@ -589,7 +522,7 @@ out the samba web page at
 <A
 HREF="http://samba.org/samba"
 TARGET="_top"
->http://samba.org/samba</A
+>http://samba.org/samba/</A
 ></P
 ><P
 >Also look at the other docs in the Samba package!</P
diff --git a/docs/htmldocs/domain-security.html b/docs/htmldocs/domain-security.html
index 7923247140..d0af4f3131 100644
--- a/docs/htmldocs/domain-security.html
+++ b/docs/htmldocs/domain-security.html
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1315"
+NAME="AEN1413"
 >9.1. Joining an NT Domain with Samba 3.0</A
 ></H1
 ><P
@@ -263,7 +263,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1369"
+NAME="AEN1467"
 >9.2. Why is this better than security = server?</A
 ></H1
 ><P
diff --git a/docs/htmldocs/groupmapping.html b/docs/htmldocs/groupmapping.html
index e82b9ea697..408c87fce6 100644
--- a/docs/htmldocs/groupmapping.html
+++ b/docs/htmldocs/groupmapping.html
@@ -2,7 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Group mapping HOWTO</TITLE
+>Configuring Group Mapping</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
@@ -16,9 +16,8 @@ REL="PREVIOUS"
 TITLE="UNIX Permission Bits and Windows NT Access Control Lists"
 HREF="unix-permissions.html"><LINK
 REL="NEXT"
-TITLE="Configuring PAM for distributed but centrally 
-managed authentication"
-HREF="pam.html"></HEAD
+TITLE="Printing Support"
+HREF="printing.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -60,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="pam.html"
+HREF="printing.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -75,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="GROUPMAPPING"
 ></A
->Chapter 12. Group mapping HOWTO</H1
+>Chapter 11. Configuring Group Mapping</H1
 ><P
 > 
 Starting with Samba 3.0 alpha 2, a new group mapping function is available. The
@@ -143,9 +142,9 @@ CLASS="COMMAND"
 >domain admins</B
 > group by running the command:</P
 ><P
-><B
-CLASS="COMMAND"
->smbgroupedit -c "Domain Admins" -u domadm</B
+><KBD
+CLASS="USERINPUT"
+>smbgroupedit -c "Domain Admins" -u domadm</KBD
 ></P
 ></LI
 ></OL
@@ -165,9 +164,9 @@ CLASS="COMMAND"
 ><P
 >You can list the various groups in the mapping database like this</P
 ><P
-><B
-CLASS="COMMAND"
->smbgroupedit -v</B
+><KBD
+CLASS="USERINPUT"
+>smbgroupedit -v</KBD
 ></P
 ></DIV
 ><DIV
@@ -204,7 +203,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="pam.html"
+HREF="printing.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -228,8 +227,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Configuring PAM for distributed but centrally 
-managed authentication</TD
+>Printing Support</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/improved-browsing.html b/docs/htmldocs/improved-browsing.html
index c6b70ddc0c..5fa18c113c 100644
--- a/docs/htmldocs/improved-browsing.html
+++ b/docs/htmldocs/improved-browsing.html
@@ -16,8 +16,8 @@ REL="PREVIOUS"
 TITLE="Integrating MS Windows networks with Samba"
 HREF="integrate-ms-networks.html"><LINK
 REL="NEXT"
-TITLE="Hosting a Microsoft Distributed File System tree on Samba"
-HREF="msdfs.html"></HEAD
+TITLE="Securing Samba"
+HREF="securing-samba.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="msdfs.html"
+HREF="securing-samba.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,18 +74,21 @@ CLASS="CHAPTER"
 ><A
 NAME="IMPROVED-BROWSING"
 ></A
->Chapter 18. Improved browsing in samba</H1
+>Chapter 22. Improved browsing in samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3047"
->18.1. Overview of browsing</A
+NAME="AEN3695"
+>22.1. Overview of browsing</A
 ></H1
 ><P
 >SMB networking provides a mechanism by which clients can access a list
-of machines in a network, a so-called "browse list".  This list
+of machines in a network, a so-called <B
+CLASS="COMMAND"
+>browse list</B
+>.  This list
 contains machines that are ready to offer file and/or print services
 to other machines within the network. Thus it does not include
 machines which aren't currently able to do server tasks.  The browse
@@ -93,7 +96,7 @@ list is heavily used by all SMB clients.  Configuration of SMB
 browsing has been problematic for some Samba users, hence this
 document.</P
 ><P
->MS Windows 2000 and later, as with Samba-3 and later, can be
+>MS Windows 2000 and later, as with Samba 3 and later, can be
 configured to not use NetBIOS over TCP/IP. When configured this way
 it is imperative that name resolution (using DNS/LDAP/ADS) be correctly
 configured and operative. Browsing will NOT work if name resolution
@@ -109,8 +112,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3052"
->18.2. Browsing support in samba</A
+NAME="AEN3701"
+>22.2. Browsing support in samba</A
 ></H1
 ><P
 >Samba facilitates browsing.  The browsing is supported by nmbd
@@ -129,45 +132,91 @@ workgroup that has the same name as an NT Domain: on each wide area
 network, you must only ever have one domain master browser per workgroup,
 regardless of whether it is NT, Samba or any other type of domain master
 that is providing this service.</P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
 ><P
->[Note that nmbd can be configured as a WINS server, but it is not
+>Nmbd can be configured as a WINS server, but it is not
 necessary to specifically use samba as your WINS server.  MS Windows
 NT4, Server or Advanced Server 2000 or 2003 can be configured as
 your WINS server.  In a mixed NT/2000/2003 server and samba environment on
 a Wide Area Network, it is recommended that you use the Microsoft
 WINS server capabilities.  In a samba-only environment, it is
 recommended that you use one and only one Samba server as your WINS server.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >To get browsing to work you need to run nmbd as usual, but will need
-to use the "workgroup" option in smb.conf to control what workgroup
-Samba becomes a part of.</P
+to use the <B
+CLASS="COMMAND"
+>workgroup</B
+> option in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>
+to control what workgroup Samba becomes a part of.</P
 ><P
 >Samba also has a useful option for a Samba server to offer itself for
 browsing on another subnet.  It is recommended that this option is only
 used for 'unusual' purposes: announcements over the internet, for
-example.  See "remote announce" in the smb.conf man page.  </P
+example.  See <B
+CLASS="COMMAND"
+>remote announce</B
+> in the 
+<TT
+CLASS="FILENAME"
+>smb.conf</TT
+> man page.  </P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3060"
->18.3. Problem resolution</A
+NAME="AEN3714"
+>22.3. Problem resolution</A
 ></H1
 ><P
 >If something doesn't work then hopefully the log.nmb file will help
 you track down the problem.  Try a debug level of 2 or 3 for finding
 problems. Also note that the current browse list usually gets stored
-in text form in a file called browse.dat.</P
+in text form in a file called <TT
+CLASS="FILENAME"
+>browse.dat</TT
+>.</P
 ><P
 >Note that if it doesn't work for you, then you should still be able to
-type the server name as \\SERVER in filemanager then hit enter and
-filemanager should display the list of available shares.</P
+type the server name as <TT
+CLASS="FILENAME"
+>\\SERVER</TT
+> in filemanager then
+hit enter and filemanager should display the list of available shares.</P
 ><P
 >Some people find browsing fails because they don't have the global
-"guest account" set to a valid account.  Remember that the IPC$
-connection that lists the shares is done as guest, and thus you must
+<B
+CLASS="COMMAND"
+>guest account</B
+> set to a valid account.  Remember that the
+IPC$ connection that lists the shares is done as guest, and thus you must
 have a valid guest account.</P
 ><P
 ><SPAN
@@ -183,13 +232,6 @@ server resources.</I
 ></SPAN
 ></P
 ><P
->Also, a lot of people are getting bitten by the problem of too many
-parameters on the command line of nmbd in inetd.conf.  This trick is to
-not use spaces between the option and the parameter (eg: -d2 instead
-of -d 2), and to not use the -B and -N options.  New versions of nmbd
-are now far more likely to correctly find your broadcast and network
-address, so in most cases these aren't needed.</P
-><P
 >The other big problem people have is that their broadcast address,
 netmask or IP address is wrong (specified with the "interfaces" option
 in smb.conf)</P
@@ -199,8 +241,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3069"
->18.4. Browsing across subnets</A
+NAME="AEN3725"
+>22.4. Browsing across subnets</A
 ></H1
 ><P
 >Since the release of Samba 1.9.17(alpha1) Samba has been
@@ -230,8 +272,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3074"
->18.4.1. How does cross subnet browsing work ?</A
+NAME="AEN3730"
+>22.4.1. How does cross subnet browsing work ?</A
 ></H2
 ><P
 >Cross subnet browsing is a complicated dance, containing multiple
@@ -441,8 +483,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3109"
->18.5. Setting up a WINS server</A
+NAME="AEN3765"
+>22.5. Setting up a WINS server</A
 ></H1
 ><P
 >Either a Samba machine or a Windows NT Server machine may be set up
@@ -460,17 +502,17 @@ yes.  If you have any older versions of Samba on your network it is
 strongly suggested you upgrade to a recent version, or at the very
 least set the parameter to 'no' on all these machines.</P
 ><P
->Machines with "<B
+>Machines with <B
 CLASS="COMMAND"
 >wins support = yes</B
->" will keep a list of 
+> will keep a list of 
 all NetBIOS names registered with them, acting as a DNS for NetBIOS names.</P
 ><P
 >You should set up only ONE wins server.  Do NOT set the
-"<B
+<B
 CLASS="COMMAND"
 >wins support = yes</B
->" option on more than one Samba 
+> option on more than one Samba 
 server.</P
 ><P
 >To set up a Windows NT Server as a WINS server you need to set up
@@ -481,8 +523,11 @@ refuse to document these replication protocols Samba cannot currently
 participate in these replications.  It is possible in the future that
 a Samba-&#62;Samba WINS replication protocol may be defined, in which
 case more than one Samba machine could be set up as a WINS server
-but currently only one Samba server should have the "wins support = yes"
-parameter set.</P
+but currently only one Samba server should have the 
+<B
+CLASS="COMMAND"
+>wins support = yes</B
+> parameter set.</P
 ><P
 >After the WINS server has been configured you must ensure that all
 machines participating on the network are configured with the address
@@ -503,14 +548,14 @@ machine or its IP address.</P
 ><P
 >Note that this line MUST NOT BE SET in the smb.conf file of the Samba
 server acting as the WINS server itself.  If you set both the
-"<B
+<B
 CLASS="COMMAND"
 >wins support = yes</B
->" option and the 
-"<B
+> option and the 
+<B
 CLASS="COMMAND"
 >wins server = &#60;name&#62;</B
->" option then
+> option then
 nmbd will fail to start.</P
 ><P
 >There are two possible scenarios for setting up cross subnet browsing.
@@ -524,8 +569,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3128"
->18.6. Setting up Browsing in a WORKGROUP</A
+NAME="AEN3785"
+>22.6. Setting up Browsing in a WORKGROUP</A
 ></H1
 ><P
 >To set up cross subnet browsing on a network containing machines
@@ -586,15 +631,31 @@ os level = 65</PRE
 or they will war with each other over which is to be the local
 master browser.</P
 ><P
->The "local master" parameter allows Samba to act as a local master
-browser.  The "preferred master" causes nmbd to force a browser
-election on startup and the "os level" parameter sets Samba high
-enough so that it should win any browser elections.</P
+>The <B
+CLASS="COMMAND"
+>local master</B
+> parameter allows Samba to act as a
+local master browser.  The <B
+CLASS="COMMAND"
+>preferred master</B
+> causes nmbd
+to force a browser election on startup and the <B
+CLASS="COMMAND"
+>os level</B
+>
+parameter sets Samba high enough so that it should win any browser elections.</P
 ><P
 >If you have an NT machine on the subnet that you wish to
 be the local master browser then you can disable Samba from
 becoming a local master browser by setting the following
-options in the [global] section of the smb.conf file :</P
+options in the <B
+CLASS="COMMAND"
+>[global]</B
+> section of the 
+<TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file :</P
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
@@ -609,8 +670,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3146"
->18.7. Setting up Browsing in a DOMAIN</A
+NAME="AEN3808"
+>22.7. Setting up Browsing in a DOMAIN</A
 ></H1
 ><P
 >If you are adding Samba servers to a Windows NT Domain then
@@ -618,13 +679,23 @@ you must not set up a Samba server as a domain master browser.
 By default, a Windows NT Primary Domain Controller for a Domain
 name is also the Domain master browser for that name, and many
 things will break if a Samba server registers the Domain master
-browser NetBIOS name (DOMAIN&#60;1B&#62;) with WINS instead of the PDC.</P
+browser NetBIOS name (<VAR
+CLASS="REPLACEABLE"
+>DOMAIN</VAR
+>&#60;1B&#62;)
+with WINS instead of the PDC.</P
 ><P
 >For subnets other than the one containing the Windows NT PDC
 you may set up Samba servers as local master browsers as
 described.  To make a Samba server a local master browser set 
-the following options in the [global] section of the smb.conf 
-file :</P
+the following options in the <B
+CLASS="COMMAND"
+>[global]</B
+> section 
+of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file :</P
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
@@ -635,17 +706,30 @@ os level = 65</PRE
 ></P
 ><P
 >If you wish to have a Samba server fight the election with machines
-on the same subnet you may set the "os level" parameter to lower
-levels.  By doing this you can tune the order of machines that
+on the same subnet you may set the <B
+CLASS="COMMAND"
+>os level</B
+> parameter
+to lower levels.  By doing this you can tune the order of machines that
 will become local master browsers if they are running.  For
-more details on this see the section "FORCING SAMBA TO BE THE MASTER"
+more details on this see the section <A
+HREF="improved-browsing.html#BROWSE-FORCE-MASTER"
+>Forcing samba to be the master browser</A
+>
 below.</P
 ><P
 >If you have Windows NT machines that are members of the domain
 on all subnets, and you are sure they will always be running then
 you can disable Samba from taking part in browser elections and
 ever becoming a local master browser by setting following options 
-in the [global] section of the smb.conf file :</P
+in the <B
+CLASS="COMMAND"
+>[global]</B
+> section of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>
+file :</P
 ><P
 ><B
 CLASS="COMMAND"
@@ -660,37 +744,64 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3156"
->18.8. Forcing samba to be the master</A
+NAME="BROWSE-FORCE-MASTER"
+>22.8. Forcing samba to be the master</A
 ></H1
 ><P
->Who becomes the "master browser" is determined by an election process
-using broadcasts.  Each election packet contains a number of parameters
+>Who becomes the <B
+CLASS="COMMAND"
+>master browser</B
+> is determined by an election
+process using broadcasts.  Each election packet contains a number of parameters
 which determine what precedence (bias) a host should have in the
 election.  By default Samba uses a very low precedence and thus loses
 elections to just about anyone else.</P
 ><P
->If you want Samba to win elections then just set the "os level" global
-option in smb.conf to a higher number.  It defaults to 0.  Using 34
+>If you want Samba to win elections then just set the <B
+CLASS="COMMAND"
+>os level</B
+> global
+option in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> to a higher number.  It defaults to 0.  Using 34
 would make it win all elections over every other system (except other
 samba systems!)</P
 ><P
->A "os level" of 2 would make it beat WfWg and Win95, but not MS Windows
+>A <B
+CLASS="COMMAND"
+>os level</B
+> of 2 would make it beat WfWg and Win95, but not MS Windows
 NT/2K Server.  A MS Windows NT/2K Server domain controller uses level 32.</P
 ><P
 >The maximum os level is 255</P
 ><P
 >If you want samba to force an election on startup, then set the
-"preferred master" global option in smb.conf to "yes".  Samba will
+<B
+CLASS="COMMAND"
+>preferred master</B
+> global option in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> to "yes".  Samba will
 then have a slight advantage over other potential master browsers
 that are not preferred master browsers.  Use this parameter with
 care, as if you have two hosts (whether they are windows 95 or NT or
-samba) on the same local subnet both set with "preferred master" to
+samba) on the same local subnet both set with <B
+CLASS="COMMAND"
+>preferred master</B
+> to
 "yes", then periodically and continually they will force an election
 in order to become the local master browser.</P
 ><P
->If you want samba to be a "domain master browser", then it is
-recommended that you also set "preferred master" to "yes", because
+>If you want samba to be a <B
+CLASS="COMMAND"
+>domain master browser</B
+>, then it is
+recommended that you also set <B
+CLASS="COMMAND"
+>preferred master</B
+> to "yes", because
 samba will not become a domain master browser for the whole of your
 LAN or WAN if it is not also a local master browser on its own
 broadcast isolated subnet.</P
@@ -708,14 +819,20 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3165"
->18.9. Making samba the domain master</A
+NAME="AEN3843"
+>22.9. Making samba the domain master</A
 ></H1
 ><P
 >The domain master is responsible for collating the browse lists of
 multiple subnets so that browsing can occur between subnets.  You can
-make samba act as the domain master by setting "domain master = yes"
-in smb.conf.  By default it will not be a domain master.</P
+make samba act as the domain master by setting <B
+CLASS="COMMAND"
+>domain master = yes</B
+>
+in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>.  By default it will not be a domain master.</P
 ><P
 >Note that you should NOT set Samba to be the domain master for a
 workgroup that has the same name as an NT Domain.</P
@@ -726,8 +843,14 @@ master browsers on other subnets and then contact them to synchronise
 browse lists.</P
 ><P
 >If you want samba to be the domain master then I suggest you also set
-the "os level" high enough to make sure it wins elections, and set
-"preferred master" to "yes", to get samba to force an election on
+the <B
+CLASS="COMMAND"
+>os level</B
+> high enough to make sure it wins elections, and set
+<B
+CLASS="COMMAND"
+>preferred master</B
+> to "yes", to get samba to force an election on
 startup.</P
 ><P
 >Note that all your servers (including samba) and clients should be
@@ -781,8 +904,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3183"
->18.10. Note about broadcast addresses</A
+NAME="AEN3865"
+>22.10. Note about broadcast addresses</A
 ></H1
 ><P
 >If your network uses a "0" based broadcast address (for example if it
@@ -795,13 +918,19 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3186"
->18.11. Multiple interfaces</A
+NAME="AEN3868"
+>22.11. Multiple interfaces</A
 ></H1
 ><P
 >Samba now supports machines with multiple network interfaces.  If you
-have multiple interfaces then you will need to use the "interfaces"
-option in smb.conf to configure them.  See smb.conf(5) for details.</P
+have multiple interfaces then you will need to use the <B
+CLASS="COMMAND"
+>interfaces</B
+>
+option in smb.conf to configure them.  See <TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+> for details.</P
 ></DIV
 ></DIV
 ><DIV
@@ -838,7 +967,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="msdfs.html"
+HREF="securing-samba.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -862,7 +991,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Hosting a Microsoft Distributed File System tree on Samba</TD
+>Securing Samba</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/install.html b/docs/htmldocs/install.html
index d596ba4fd9..41f69eb8d3 100644
--- a/docs/htmldocs/install.html
+++ b/docs/htmldocs/install.html
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN26"
+NAME="AEN65"
 >1.1. Obtaining and installing samba</A
 ></H1
 ><P
@@ -101,7 +101,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN31"
+NAME="AEN70"
 >1.2. Configuring samba</A
 ></H1
 ><P
@@ -122,7 +122,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN36"
+NAME="AEN75"
 >1.2.1. Editing the smb.conf file</A
 ></H2
 ><P
@@ -177,7 +177,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN50"
+NAME="AEN89"
 >1.2.1.1. Test your config file with 
 	<B
 CLASS="COMMAND"
@@ -208,7 +208,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN58"
+NAME="AEN97"
 >1.2.2. SWAT</A
 ></H2
 ><P
@@ -236,7 +236,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN64"
+NAME="AEN103"
 >1.3. Try listing the shares available on your 
 	server</A
 ></H1
@@ -273,7 +273,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN73"
+NAME="AEN112"
 >1.4. Try connecting with the unix client</A
 ></H1
 ><P
@@ -326,7 +326,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN89"
+NAME="AEN128"
 >1.5. Try connecting from a DOS, WfWg, Win9x, WinNT, 
 	Win2k, OS/2, etc... client</A
 ></H1
@@ -369,7 +369,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN103"
+NAME="AEN142"
 >1.6. What If Things Don't Work?</A
 ></H1
 ><P
@@ -395,7 +395,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108"
+NAME="AEN147"
 >1.6.1. Scope IDs</A
 ></H2
 ><P
@@ -411,7 +411,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN111"
+NAME="AEN150"
 >1.6.2. Locking</A
 ></H2
 ><P
diff --git a/docs/htmldocs/integrate-ms-networks.html b/docs/htmldocs/integrate-ms-networks.html
index 433fb5b50d..5397d4c2bd 100644
--- a/docs/htmldocs/integrate-ms-networks.html
+++ b/docs/htmldocs/integrate-ms-networks.html
@@ -13,8 +13,8 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Unified Logons between Windows NT and UNIX using Winbind"
-HREF="winbind.html"><LINK
+TITLE="Hosting a Microsoft Distributed File System tree on Samba"
+HREF="msdfs.html"><LINK
 REL="NEXT"
 TITLE="Improved browsing in samba"
 HREF="improved-browsing.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="winbind.html"
+HREF="msdfs.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="INTEGRATE-MS-NETWORKS"
 ></A
->Chapter 17. Integrating MS Windows networks with Samba</H1
+>Chapter 21. Integrating MS Windows networks with Samba</H1
 ><P
 >This section deals with NetBIOS over TCP/IP name to IP address resolution. If you
 your MS Windows clients are NOT configured to use NetBIOS over TCP/IP then this
@@ -155,8 +155,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2932"
->17.1. Name Resolution in a pure Unix/Linux world</A
+NAME="AEN3580"
+>21.1. Name Resolution in a pure Unix/Linux world</A
 ></H1
 ><P
 >The key configuration files covered in this section are:</P
@@ -197,8 +197,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2948"
->17.1.1. <TT
+NAME="AEN3596"
+>21.1.1. <TT
 CLASS="FILENAME"
 >/etc/hosts</TT
 ></A
@@ -278,8 +278,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2964"
->17.1.2. <TT
+NAME="AEN3612"
+>21.1.2. <TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
 ></A
@@ -316,8 +316,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2975"
->17.1.3. <TT
+NAME="AEN3623"
+>21.1.3. <TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
 ></A
@@ -345,8 +345,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2983"
->17.1.4. <TT
+NAME="AEN3631"
+>21.1.4. <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
 ></A
@@ -414,8 +414,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2995"
->17.2. Name resolution as used within MS Windows networking</A
+NAME="AEN3643"
+>21.2. Name resolution as used within MS Windows networking</A
 ></H1
 ><P
 >MS Windows networking is predicated about the name each machine 
@@ -499,8 +499,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3007"
->17.2.1. The NetBIOS Name Cache</A
+NAME="AEN3655"
+>21.2.1. The NetBIOS Name Cache</A
 ></H2
 ><P
 >All MS Windows machines employ an in memory buffer in which is 
@@ -526,8 +526,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3012"
->17.2.2. The LMHOSTS file</A
+NAME="AEN3660"
+>21.2.2. The LMHOSTS file</A
 ></H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 
@@ -629,8 +629,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3020"
->17.2.3. HOSTS file</A
+NAME="AEN3668"
+>21.2.3. HOSTS file</A
 ></H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 2000 in 
@@ -651,8 +651,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3025"
->17.2.4. DNS Lookup</A
+NAME="AEN3673"
+>21.2.4. DNS Lookup</A
 ></H2
 ><P
 >This capability is configured in the TCP/IP setup area in the network 
@@ -671,8 +671,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3028"
->17.2.5. WINS Lookup</A
+NAME="AEN3676"
+>21.2.5. WINS Lookup</A
 ></H2
 ><P
 >A WINS (Windows Internet Name Server) service is the equivaent of the 
@@ -724,7 +724,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="winbind.html"
+HREF="msdfs.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -752,7 +752,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Unified Logons between Windows NT and UNIX using Winbind</TD
+>Hosting a Microsoft Distributed File System tree on Samba</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/introduction.html b/docs/htmldocs/introduction.html
index 6c5e6df9ee..a46916c046 100644
--- a/docs/htmldocs/introduction.html
+++ b/docs/htmldocs/introduction.html
@@ -78,7 +78,7 @@ CLASS="TITLE"
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN21"
+NAME="AEN42"
 ></A
 ><H1
 >Introduction</H1
@@ -103,60 +103,60 @@ HREF="install.html"
 ><DL
 ><DT
 >1.1. <A
-HREF="install.html#AEN26"
+HREF="install.html#AEN65"
 >Obtaining and installing samba</A
 ></DT
 ><DT
 >1.2. <A
-HREF="install.html#AEN31"
+HREF="install.html#AEN70"
 >Configuring samba</A
 ></DT
 ><DD
 ><DL
 ><DT
 >1.2.1. <A
-HREF="install.html#AEN36"
+HREF="install.html#AEN75"
 >Editing the smb.conf file</A
 ></DT
 ><DT
 >1.2.2. <A
-HREF="install.html#AEN58"
+HREF="install.html#AEN97"
 >SWAT</A
 ></DT
 ></DL
 ></DD
 ><DT
 >1.3. <A
-HREF="install.html#AEN64"
+HREF="install.html#AEN103"
 >Try listing the shares available on your 
 	server</A
 ></DT
 ><DT
 >1.4. <A
-HREF="install.html#AEN73"
+HREF="install.html#AEN112"
 >Try connecting with the unix client</A
 ></DT
 ><DT
 >1.5. <A
-HREF="install.html#AEN89"
+HREF="install.html#AEN128"
 >Try connecting from a DOS, WfWg, Win9x, WinNT, 
 	Win2k, OS/2, etc... client</A
 ></DT
 ><DT
 >1.6. <A
-HREF="install.html#AEN103"
+HREF="install.html#AEN142"
 >What If Things Don't Work?</A
 ></DT
 ><DD
 ><DL
 ><DT
 >1.6.1. <A
-HREF="install.html#AEN108"
+HREF="install.html#AEN147"
 >Scope IDs</A
 ></DT
 ><DT
 >1.6.2. <A
-HREF="install.html#AEN111"
+HREF="install.html#AEN150"
 >Locking</A
 ></DT
 ></DL
@@ -172,38 +172,44 @@ HREF="browsing-quick.html"
 ><DL
 ><DT
 >2.1. <A
-HREF="browsing-quick.html#AEN130"
+HREF="browsing-quick.html#AEN174"
 >Discussion</A
 ></DT
 ><DT
 >2.2. <A
-HREF="browsing-quick.html#AEN139"
+HREF="browsing-quick.html#AEN193"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></DT
 ><DT
 >2.3. <A
-HREF="browsing-quick.html#AEN149"
->Use of the "Remote Announce" parameter</A
+HREF="browsing-quick.html#AEN207"
+>Use of the <B
+CLASS="COMMAND"
+>Remote Announce</B
+> parameter</A
 ></DT
 ><DT
 >2.4. <A
-HREF="browsing-quick.html#AEN163"
->Use of the "Remote Browse Sync" parameter</A
+HREF="browsing-quick.html#AEN230"
+>Use of the <B
+CLASS="COMMAND"
+>Remote Browse Sync</B
+> parameter</A
 ></DT
 ><DT
 >2.5. <A
-HREF="browsing-quick.html#AEN168"
+HREF="browsing-quick.html#AEN241"
 >Use of WINS</A
 ></DT
 ><DT
 >2.6. <A
-HREF="browsing-quick.html#AEN179"
+HREF="browsing-quick.html#AEN255"
 >Do NOT use more than one (1) protocol on MS Windows machines</A
 ></DT
 ><DT
 >2.7. <A
-HREF="browsing-quick.html#AEN187"
+HREF="browsing-quick.html#AEN263"
 >Name Resolution Order</A
 ></DT
 ></DL
@@ -217,153 +223,134 @@ HREF="passdb.html"
 ><DL
 ><DT
 >3.1. <A
-HREF="passdb.html#AEN244"
+HREF="passdb.html#AEN321"
 >Introduction</A
 ></DT
 ><DT
 >3.2. <A
-HREF="passdb.html#AEN251"
+HREF="passdb.html#AEN328"
 >Important Notes About Security</A
 ></DT
 ><DD
 ><DL
 ><DT
 >3.2.1. <A
-HREF="passdb.html#AEN277"
+HREF="passdb.html#AEN354"
 >Advantages of SMB Encryption</A
 ></DT
 ><DT
 >3.2.2. <A
-HREF="passdb.html#AEN283"
+HREF="passdb.html#AEN360"
 >Advantages of non-encrypted passwords</A
 ></DT
 ></DL
 ></DD
 ><DT
 >3.3. <A
-HREF="passdb.html#AEN289"
+HREF="passdb.html#AEN366"
 >The smbpasswd Command</A
 ></DT
 ><DT
 >3.4. <A
-HREF="passdb.html#AEN320"
+HREF="passdb.html#AEN397"
 >Plain text</A
 ></DT
 ><DT
 >3.5. <A
-HREF="passdb.html#AEN325"
+HREF="passdb.html#AEN402"
 >TDB</A
 ></DT
 ><DT
 >3.6. <A
-HREF="passdb.html#AEN328"
+HREF="passdb.html#AEN405"
 >LDAP</A
 ></DT
 ><DD
 ><DL
 ><DT
 >3.6.1. <A
-HREF="passdb.html#AEN330"
+HREF="passdb.html#AEN407"
 >Introduction</A
 ></DT
 ><DT
 >3.6.2. <A
-HREF="passdb.html#AEN350"
+HREF="passdb.html#AEN427"
 >Introduction</A
 ></DT
 ><DT
 >3.6.3. <A
-HREF="passdb.html#AEN379"
+HREF="passdb.html#AEN456"
 >Supported LDAP Servers</A
 ></DT
 ><DT
 >3.6.4. <A
-HREF="passdb.html#AEN384"
+HREF="passdb.html#AEN461"
 >Schema and Relationship to the RFC 2307 posixAccount</A
 ></DT
 ><DT
 >3.6.5. <A
-HREF="passdb.html#AEN396"
+HREF="passdb.html#AEN473"
 >Configuring Samba with LDAP</A
 ></DT
 ><DT
 >3.6.6. <A
-HREF="passdb.html#AEN443"
+HREF="passdb.html#AEN520"
 >Accounts and Groups management</A
 ></DT
 ><DT
 >3.6.7. <A
-HREF="passdb.html#AEN448"
+HREF="passdb.html#AEN525"
 >Security and sambaAccount</A
 ></DT
 ><DT
 >3.6.8. <A
-HREF="passdb.html#AEN468"
+HREF="passdb.html#AEN545"
 >LDAP specials attributes for sambaAccounts</A
 ></DT
 ><DT
 >3.6.9. <A
-HREF="passdb.html#AEN538"
+HREF="passdb.html#AEN615"
 >Example LDIF Entries for a sambaAccount</A
 ></DT
 ></DL
 ></DD
 ><DT
 >3.7. <A
-HREF="passdb.html#AEN546"
+HREF="passdb.html#AEN623"
 >MySQL</A
 ></DT
 ><DD
 ><DL
 ><DT
 >3.7.1. <A
-HREF="passdb.html#AEN548"
->Building</A
-></DT
-><DT
->3.7.2. <A
-HREF="passdb.html#AEN554"
+HREF="passdb.html#AEN625"
 >Creating the database</A
 ></DT
 ><DT
->3.7.3. <A
-HREF="passdb.html#AEN564"
+>3.7.2. <A
+HREF="passdb.html#AEN635"
 >Configuring</A
 ></DT
 ><DT
->3.7.4. <A
-HREF="passdb.html#AEN581"
+>3.7.3. <A
+HREF="passdb.html#AEN652"
 >Using plaintext passwords or encrypted password</A
 ></DT
 ><DT
->3.7.5. <A
-HREF="passdb.html#AEN586"
+>3.7.4. <A
+HREF="passdb.html#AEN657"
 >Getting non-column data from the table</A
 ></DT
 ></DL
 ></DD
 ><DT
 >3.8. <A
-HREF="passdb.html#AEN594"
->Passdb XML plugin</A
-></DT
-><DD
-><DL
-><DT
->3.8.1. <A
-HREF="passdb.html#AEN596"
->Building</A
-></DT
-><DT
->3.8.2. <A
-HREF="passdb.html#AEN602"
->Usage</A
+HREF="passdb.html#AEN665"
+>XML</A
 ></DT
 ></DL
 ></DD
 ></DL
-></DD
-></DL
 ></DIV
 ></DIV
 ></DIV
diff --git a/docs/htmldocs/msdfs.html b/docs/htmldocs/msdfs.html
index 0df9a814d4..4d31559417 100644
--- a/docs/htmldocs/msdfs.html
+++ b/docs/htmldocs/msdfs.html
@@ -13,11 +13,11 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Improved browsing in samba"
-HREF="improved-browsing.html"><LINK
-REL="NEXT"
 TITLE="Stackable VFS modules"
-HREF="vfs.html"></HEAD
+HREF="vfs.html"><LINK
+REL="NEXT"
+TITLE="Integrating MS Windows networks with Samba"
+HREF="integrate-ms-networks.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="improved-browsing.html"
+HREF="vfs.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="vfs.html"
+HREF="integrate-ms-networks.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="MSDFS"
 ></A
->Chapter 19. Hosting a Microsoft Distributed File System tree on Samba</H1
+>Chapter 20. Hosting a Microsoft Distributed File System tree on Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3200"
->19.1. Instructions</A
+NAME="AEN3518"
+>20.1. Instructions</A
 ></H1
 ><P
 >The Distributed File System (or Dfs) provides a means of 
@@ -212,8 +212,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3235"
->19.1.1. Notes</A
+NAME="AEN3553"
+>20.1.1. Notes</A
 ></H2
 ><P
 ></P
@@ -257,7 +257,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="improved-browsing.html"
+HREF="vfs.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -275,7 +275,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="vfs.html"
+HREF="integrate-ms-networks.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -285,7 +285,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Improved browsing in samba</TD
+>Stackable VFS modules</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -299,7 +299,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Stackable VFS modules</TD
+>Integrating MS Windows networks with Samba</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index f4f8caf81f..6b8161e02e 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -196,14 +196,6 @@ CLASS="COMMAND"
 		than a file.</P
 ></DD
 ><DT
->-a</DT
-><DD
-><P
->If this parameter is specified, each new 
-		connection will append log messages to the log file.  
-		This is the default.</P
-></DD
-><DT
 >-i</DT
 ><DD
 ><P
@@ -222,26 +214,10 @@ CLASS="CONSTANT"
 		given. </P
 ></DD
 ><DT
->-o</DT
-><DD
-><P
->If this parameter is specified, the 
-		log files will be overwritten when opened.  By default, 
-		<B
-CLASS="COMMAND"
->smbd</B
-> will append entries to the log 
-		files.</P
-></DD
-><DT
->-h</DT
+>-h|--help</DT
 ><DD
 ><P
->Prints the help information (usage) 
-		for <B
-CLASS="COMMAND"
->nmbd</B
->.</P
+>Print a summary of command line options.</P
 ></DD
 ><DT
 >-H &#60;filename&#62;</DT
@@ -312,113 +288,80 @@ CLASS="REFENTRYTITLE"
 ><DD
 ><P
 >Prints the version number for 
-		<B
+<B
 CLASS="COMMAND"
->nmbd</B
+>smbd</B
 >.</P
 ></DD
 ><DT
->-d &#60;debug level&#62;</DT
+>-s &#60;configuration file&#62;</DT
 ><DD
 ><P
->debuglevel is an integer 
-		from 0 to 10.  The default value if this parameter is 
-		not specified is zero.</P
-><P
->The higher this value, the more detail will 
-		be logged to the log files about the activities of the 
-		server. At level 0, only critical errors and serious 
-		warnings will be logged. Level 1 is a reasonable level for
-		day to day running - it generates a small amount of 
-		information about operations carried out.</P
-><P
->Levels above 1 will generate considerable amounts 
-		of log data, and should only be used when investigating 
- 		a problem. Levels above 3 are designed for use only by developers 
-		and generate HUGE amounts of log data, most of which is extremely 
-		cryptic.</P
-><P
->Note that specifying this parameter here will override 
-		the <A
-HREF="smb.conf.5.html#loglevel"
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
 TARGET="_top"
-><VAR
-CLASS="PARAMETER"
->log level</VAR
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
 ></A
-> 
-		parameter in the <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> file.</P
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
 ></DD
 ><DT
->-l &#60;log directory&#62;</DT
+>-d|--debug=debuglevel</DT
 ><DD
 ><P
->The -l parameter specifies a directory 
-		into which the "log.nmbd" log file will be created
-		for operational data from the running <B
-CLASS="COMMAND"
->nmbd</B
->
-		server. The default log directory is compiled into Samba
-		as part of the build process. Common defaults are <TT
-CLASS="FILENAME"
->		/usr/local/samba/var/log.nmb</TT
->, <TT
-CLASS="FILENAME"
->		/usr/samba/var/log.nmb</TT
-> or
-		<TT
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
 CLASS="FILENAME"
->/var/log/log.nmb</TT
->.  <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Beware:</I
-></SPAN
->
-                If the directory specified does not exist, <B
-CLASS="COMMAND"
->nmbd</B
->
-                will log to the default debug log location defined at compile time.
-		</P
+>smb.conf(5)</TT
+></A
+> file.</P
 ></DD
 ><DT
->-n &#60;primary NetBIOS name&#62;</DT
+>-l|--logfile=logbasename</DT
 ><DD
 ><P
->This option allows you to override
-		the NetBIOS name that Samba uses for itself. This is identical 
-		to setting the <A
-HREF="smb.conf.5.html#netbiosname"
-TARGET="_top"
-><VAR
-CLASS="PARAMETER"
->NetBIOS
-		name</VAR
-></A
-> parameter in the <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> file.  However, a command
-		line setting will take precedence over settings in 
-		<SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
->.</P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ><DT
 >-p &#60;UDP port number&#62;</DT
@@ -433,34 +376,13 @@ CLASS="COMMAND"
 		use this option unless you are an expert, in which case you
 		won't need help!</P
 ></DD
-><DT
->-s &#60;configuration file&#62;</DT
-><DD
-><P
->The default configuration file name
-		is set at build time, typically as <TT
-CLASS="FILENAME"
->		/usr/local/samba/lib/smb.conf</TT
->, but
-		this may be changed when Samba is autoconfigured.</P
-><P
->The file specified contains the configuration details
-		required by the server. See <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> for more information.
-		</P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN162"
+NAME="AEN131"
 ></A
 ><H2
 >FILES</H2
@@ -629,7 +551,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN216"
+NAME="AEN185"
 ></A
 ><H2
 >SIGNALS</H2
@@ -693,7 +615,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN233"
+NAME="AEN202"
 ></A
 ><H2
 >VERSION</H2
@@ -704,7 +626,7 @@ NAME="AEN233"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN236"
+NAME="AEN205"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -764,7 +686,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN260"
+NAME="AEN229"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/nmblookup.1.html b/docs/htmldocs/nmblookup.1.html
index 1e3c3c56ad..cb1df2cd82 100644
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@@ -148,10 +148,86 @@ CLASS="REPLACEABLE"
 		an IP Address and do a node status query on this address.</P
 ></DD
 ><DT
->-h</DT
+>-n &#60;primary NetBIOS name&#62;</DT
 ><DD
 ><P
->Print a help (usage) message.</P
+>This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the <A
+HREF="smb.conf.5.html#netbiosname"
+TARGET="_top"
+><VAR
+CLASS="PARAMETER"
+>NetBIOS
+name</VAR
+></A
+> parameter in the <SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+> file.  However, a command
+line setting will take precedence over settings in
+<SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+>.</P
+></DD
+><DT
+>-i &#60;scope&#62;</DT
+><DD
+><P
+>This specifies a NetBIOS scope that
+<B
+CLASS="COMMAND"
+>nmblookup</B
+> will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>very</I
+></SPAN
+> rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.</P
+></DD
+><DT
+>-W|--workgroup=domain</DT
+><DD
+><P
+>Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). </P
+></DD
+><DT
+>-O socket options</DT
+><DD
+><P
+>TCP socket options to set on the client
+socket. See the socket options parameter in
+the <SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+> manual page for the list of valid
+options. </P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
 ></DD
 ><DT
 >-B &#60;broadcast address&#62;</DT
@@ -193,71 +269,84 @@ CLASS="PARAMETER"
 		query a WINS server.</P
 ></DD
 ><DT
->-d &#60;debuglevel&#62;</DT
+>-V</DT
 ><DD
 ><P
->debuglevel is an integer from 0 to 10.</P
-><P
->The default value if this parameter is not specified 
-		is zero.</P
-><P
->The higher this value, the more detail will be logged 
-		about the activities of <B
+>Prints the version number for 
+<B
 CLASS="COMMAND"
->nmblookup</B
->. At level 
-		0, only critical errors and serious warnings will be logged.</P
-><P
->Levels above 1 will generate considerable amounts of 
-		log data, and should only be used when investigating a problem. 
-		Levels above 3 are designed for use only by developers and 
-		generate HUGE amounts of data, most of which is extremely cryptic.</P
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
 ><P
->Note that specifying this parameter here will override 
-		the <A
-HREF="smb.conf.5.html#LOGLEVEL"
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
 TARGET="_top"
-><VAR
-CLASS="PARAMETER"
->		log level</VAR
-></A
-> parameter in the <TT
+><TT
 CLASS="FILENAME"
->		smb.conf(5)</TT
-> file.</P
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
 ></DD
 ><DT
->-s &#60;smb.conf&#62;</DT
+>-d|--debug=debuglevel</DT
 ><DD
 ><P
->This parameter specifies the pathname to 
-		the Samba configuration file, <A
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
 HREF="smb.conf.5.html"
 TARGET="_top"
->		smb.conf(5)</A
->.  This file controls all aspects of
-		the Samba setup on the machine.</P
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
 ></DD
 ><DT
->-i &#60;scope&#62;</DT
+>-l|--logfile=logbasename</DT
 ><DD
 ><P
->This specifies a NetBIOS scope that
-		<B
-CLASS="COMMAND"
->nmblookup</B
-> will use to communicate with when 
-		generating NetBIOS names. For details on the use of NetBIOS 
-		scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are 
-		<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->very</I
-></SPAN
-> rarely used, only set this parameter 
-		if you are the system administrator in charge of all the 
-		NetBIOS systems you communicate with.</P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ><DT
 >-T</DT
@@ -303,7 +392,7 @@ CLASS="EMPHASIS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN121"
+NAME="AEN154"
 ></A
 ><H2
 >EXAMPLES</H2
@@ -340,7 +429,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN133"
+NAME="AEN166"
 ></A
 ><H2
 >VERSION</H2
@@ -351,7 +440,7 @@ NAME="AEN133"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN136"
+NAME="AEN169"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -379,7 +468,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN148"
+NAME="AEN181"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/optional.html b/docs/htmldocs/optional.html
index 15e2e998a0..8be8bea805 100644
--- a/docs/htmldocs/optional.html
+++ b/docs/htmldocs/optional.html
@@ -13,8 +13,8 @@ REL="PREVIOUS"
 TITLE="Samba as a NT4 or Win2k domain member"
 HREF="domain-security.html"><LINK
 REL="NEXT"
-TITLE="System Policies"
-HREF="advancednetworkmanagement.html"></HEAD
+TITLE="UNIX Permission Bits and Windows NT Access Control Lists"
+HREF="unix-permissions.html"></HEAD
 ><BODY
 CLASS="PART"
 BGCOLOR="#FFFFFF"
@@ -56,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="advancednetworkmanagement.html"
+HREF="unix-permissions.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -78,7 +78,7 @@ CLASS="TITLE"
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN1387"
+NAME="AEN1485"
 ></A
 ><H1
 >Introduction</H1
@@ -95,297 +95,195 @@ CLASS="TOC"
 ></DT
 ><DT
 >10. <A
-HREF="advancednetworkmanagement.html"
->System Policies</A
-></DT
-><DD
-><DL
-><DT
->10.1. <A
-HREF="advancednetworkmanagement.html#AEN1401"
->Basic System Policy Info</A
-></DT
-><DD
-><DL
-><DT
->10.1.1. <A
-HREF="advancednetworkmanagement.html#AEN1445"
->Creating Group Prolicy Files</A
-></DT
-></DL
-></DD
-><DT
->10.2. <A
-HREF="advancednetworkmanagement.html#AEN1456"
->Roaming Profiles</A
-></DT
-><DD
-><DL
-><DT
->10.2.1. <A
-HREF="advancednetworkmanagement.html#AEN1464"
->Windows NT Configuration</A
-></DT
-><DT
->10.2.2. <A
-HREF="advancednetworkmanagement.html#AEN1473"
->Windows 9X Configuration</A
-></DT
-><DT
->10.2.3. <A
-HREF="advancednetworkmanagement.html#AEN1481"
->Win9X and WinNT Configuration</A
-></DT
-><DT
->10.2.4. <A
-HREF="advancednetworkmanagement.html#AEN1488"
->Windows 9X Profile Setup</A
-></DT
-><DT
->10.2.5. <A
-HREF="advancednetworkmanagement.html#AEN1524"
->Windows NT Workstation 4.0</A
-></DT
-><DT
->10.2.6. <A
-HREF="advancednetworkmanagement.html#AEN1532"
->Windows NT/200x Server</A
-></DT
-><DT
->10.2.7. <A
-HREF="advancednetworkmanagement.html#AEN1535"
->Sharing Profiles between W9x/Me and NT4/200x/XP workstations</A
-></DT
-><DT
->10.2.8. <A
-HREF="advancednetworkmanagement.html#AEN1542"
->Windows NT 4</A
-></DT
-><DT
->10.2.9. <A
-HREF="advancednetworkmanagement.html#AEN1580"
->Windows 2000/XP</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->11. <A
 HREF="unix-permissions.html"
 >UNIX Permission Bits and Windows NT Access Control Lists</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="unix-permissions.html#AEN1663"
+>10.1. <A
+HREF="unix-permissions.html#AEN1499"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
->11.2. <A
-HREF="unix-permissions.html#AEN1667"
+>10.2. <A
+HREF="unix-permissions.html#AEN1505"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
->11.3. <A
-HREF="unix-permissions.html#AEN1678"
+>10.3. <A
+HREF="unix-permissions.html#AEN1516"
 >Viewing file ownership</A
 ></DT
 ><DT
->11.4. <A
-HREF="unix-permissions.html#AEN1698"
+>10.4. <A
+HREF="unix-permissions.html#AEN1536"
 >Viewing file or directory permissions</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.4.1. <A
-HREF="unix-permissions.html#AEN1713"
+>10.4.1. <A
+HREF="unix-permissions.html#AEN1551"
 >File Permissions</A
 ></DT
 ><DT
->11.4.2. <A
-HREF="unix-permissions.html#AEN1727"
+>10.4.2. <A
+HREF="unix-permissions.html#AEN1565"
 >Directory Permissions</A
 ></DT
 ></DL
 ></DD
 ><DT
->11.5. <A
-HREF="unix-permissions.html#AEN1734"
+>10.5. <A
+HREF="unix-permissions.html#AEN1572"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
->11.6. <A
-HREF="unix-permissions.html#AEN1756"
+>10.6. <A
+HREF="unix-permissions.html#AEN1594"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
->11.7. <A
-HREF="unix-permissions.html#AEN1810"
+>10.7. <A
+HREF="unix-permissions.html#AEN1648"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
 ></DL
 ></DD
 ><DT
->12. <A
+>11. <A
 HREF="groupmapping.html"
->Group mapping HOWTO</A
-></DT
-><DT
->13. <A
-HREF="pam.html"
->Configuring PAM for distributed but centrally 
-managed authentication</A
+>Configuring Group Mapping</A
 ></DT
-><DD
-><DL
 ><DT
->13.1. <A
-HREF="pam.html#AEN1866"
->Samba and PAM</A
-></DT
-><DT
->13.2. <A
-HREF="pam.html#AEN1915"
->Distributed Authentication</A
-></DT
-><DT
->13.3. <A
-HREF="pam.html#AEN1920"
->PAM Configuration in smb.conf</A
-></DT
-></DL
-></DD
-><DT
->14. <A
+>12. <A
 HREF="printing.html"
 >Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.1. <A
-HREF="printing.html#AEN1946"
+>12.1. <A
+HREF="printing.html#AEN1711"
 >Introduction</A
 ></DT
 ><DT
->14.2. <A
-HREF="printing.html#AEN1968"
+>12.2. <A
+HREF="printing.html#AEN1733"
 >Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.2.1. <A
-HREF="printing.html#AEN1976"
+>12.2.1. <A
+HREF="printing.html#AEN1741"
 >Creating [print$]</A
 ></DT
 ><DT
->14.2.2. <A
-HREF="printing.html#AEN2011"
+>12.2.2. <A
+HREF="printing.html#AEN1776"
 >Setting Drivers for Existing Printers</A
 ></DT
 ><DT
->14.2.3. <A
-HREF="printing.html#AEN2027"
+>12.2.3. <A
+HREF="printing.html#AEN1792"
 >Support a large number of printers</A
 ></DT
 ><DT
->14.2.4. <A
-HREF="printing.html#AEN2038"
+>12.2.4. <A
+HREF="printing.html#AEN1807"
 >Adding New Printers via the Windows NT APW</A
 ></DT
 ><DT
->14.2.5. <A
-HREF="printing.html#AEN2068"
+>12.2.5. <A
+HREF="printing.html#AEN1837"
 >Samba and Printer Ports</A
 ></DT
 ></DL
 ></DD
 ><DT
->14.3. <A
-HREF="printing.html#AEN2076"
+>12.3. <A
+HREF="printing.html#AEN1845"
 >The Imprints Toolset</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.3.1. <A
-HREF="printing.html#AEN2080"
+>12.3.1. <A
+HREF="printing.html#AEN1849"
 >What is Imprints?</A
 ></DT
 ><DT
->14.3.2. <A
-HREF="printing.html#AEN2090"
+>12.3.2. <A
+HREF="printing.html#AEN1859"
 >Creating Printer Driver Packages</A
 ></DT
 ><DT
->14.3.3. <A
-HREF="printing.html#AEN2093"
+>12.3.3. <A
+HREF="printing.html#AEN1862"
 >The Imprints server</A
 ></DT
 ><DT
->14.3.4. <A
-HREF="printing.html#AEN2097"
+>12.3.4. <A
+HREF="printing.html#AEN1866"
 >The Installation Client</A
 ></DT
 ></DL
 ></DD
 ><DT
->14.4. <A
-HREF="printing.html#AEN2119"
+>12.4. <A
+HREF="printing.html#AEN1888"
 >Diagnosis</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.4.1. <A
-HREF="printing.html#AEN2121"
+>12.4.1. <A
+HREF="printing.html#AEN1890"
 >Introduction</A
 ></DT
 ><DT
->14.4.2. <A
-HREF="printing.html#AEN2137"
+>12.4.2. <A
+HREF="printing.html#AEN1906"
 >Debugging printer problems</A
 ></DT
 ><DT
->14.4.3. <A
-HREF="printing.html#AEN2146"
+>12.4.3. <A
+HREF="printing.html#AEN1915"
 >What printers do I have?</A
 ></DT
 ><DT
->14.4.4. <A
-HREF="printing.html#AEN2154"
+>12.4.4. <A
+HREF="printing.html#AEN1923"
 >Setting up printcap and print servers</A
 ></DT
 ><DT
->14.4.5. <A
-HREF="printing.html#AEN2182"
+>12.4.5. <A
+HREF="printing.html#AEN1951"
 >Job sent, no output</A
 ></DT
 ><DT
->14.4.6. <A
-HREF="printing.html#AEN2193"
+>12.4.6. <A
+HREF="printing.html#AEN1962"
 >Job sent, strange output</A
 ></DT
 ><DT
->14.4.7. <A
-HREF="printing.html#AEN2205"
+>12.4.7. <A
+HREF="printing.html#AEN1974"
 >Raw PostScript printed</A
 ></DT
 ><DT
->14.4.8. <A
-HREF="printing.html#AEN2208"
+>12.4.8. <A
+HREF="printing.html#AEN1977"
 >Advanced Printing</A
 ></DT
 ><DT
->14.4.9. <A
-HREF="printing.html#AEN2211"
+>12.4.9. <A
+HREF="printing.html#AEN1980"
 >Real debugging</A
 ></DT
 ></DL
@@ -393,243 +291,357 @@ HREF="printing.html#AEN2211"
 ></DL
 ></DD
 ><DT
->15. <A
+>13. <A
 HREF="cups-printing.html"
 >CUPS Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.1. <A
-HREF="cups-printing.html#AEN2231"
+>13.1. <A
+HREF="cups-printing.html#AEN2000"
 >Introduction</A
 ></DT
 ><DT
->15.2. <A
-HREF="cups-printing.html#AEN2236"
->CUPS - RAW Print Through  Mode</A
+>13.2. <A
+HREF="cups-printing.html#AEN2007"
+>Configuring <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> for CUPS</A
 ></DT
 ><DT
->15.3. <A
-HREF="cups-printing.html#AEN2291"
+>13.3. <A
+HREF="cups-printing.html#AEN2026"
+>CUPS - RAW Print Through Mode</A
+></DT
+><DT
+>13.4. <A
+HREF="cups-printing.html#AEN2083"
+>CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe
+PostScript driver with CUPS-PPDs downloaded to clients</A
+></DT
+><DT
+>13.5. <A
+HREF="cups-printing.html#AEN2104"
+>Windows Terminal Servers (WTS) as CUPS clients</A
+></DT
+><DT
+>13.6. <A
+HREF="cups-printing.html#AEN2108"
+>Setting up CUPS for driver download</A
+></DT
+><DT
+>13.7. <A
+HREF="cups-printing.html#AEN2120"
+>Sources of CUPS drivers / PPDs</A
+></DT
+><DD
+><DL
+><DT
+>13.7.1. <A
+HREF="cups-printing.html#AEN2147"
+><B
+CLASS="COMMAND"
+>cupsaddsmb</B
+></A
+></DT
+></DL
+></DD
+><DT
+>13.8. <A
+HREF="cups-printing.html#AEN2176"
 >The CUPS Filter Chains</A
 ></DT
 ><DT
->15.4. <A
-HREF="cups-printing.html#AEN2330"
+>13.9. <A
+HREF="cups-printing.html#AEN2215"
 >CUPS Print Drivers and Devices</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.4.1. <A
-HREF="cups-printing.html#AEN2337"
+>13.9.1. <A
+HREF="cups-printing.html#AEN2222"
 >Further printing steps</A
 ></DT
 ></DL
 ></DD
 ><DT
->15.5. <A
-HREF="cups-printing.html#AEN2407"
+>13.10. <A
+HREF="cups-printing.html#AEN2292"
 >Limiting the number of pages users can print</A
 ></DT
 ><DT
->15.6. <A
-HREF="cups-printing.html#AEN2496"
+>13.11. <A
+HREF="cups-printing.html#AEN2388"
 >Advanced Postscript Printing from MS Windows</A
 ></DT
 ><DT
->15.7. <A
-HREF="cups-printing.html#AEN2511"
+>13.12. <A
+HREF="cups-printing.html#AEN2403"
 >Auto-Deletion of CUPS spool files</A
 ></DT
 ></DL
 ></DD
 ><DT
->16. <A
+>14. <A
 HREF="winbind.html"
 >Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.1. <A
-HREF="winbind.html#AEN2573"
+>14.1. <A
+HREF="winbind.html#AEN2469"
 >Abstract</A
 ></DT
 ><DT
->16.2. <A
-HREF="winbind.html#AEN2577"
+>14.2. <A
+HREF="winbind.html#AEN2473"
 >Introduction</A
 ></DT
 ><DT
->16.3. <A
-HREF="winbind.html#AEN2590"
+>14.3. <A
+HREF="winbind.html#AEN2486"
 >What Winbind Provides</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.3.1. <A
-HREF="winbind.html#AEN2597"
+>14.3.1. <A
+HREF="winbind.html#AEN2493"
 >Target Uses</A
 ></DT
 ></DL
 ></DD
 ><DT
->16.4. <A
-HREF="winbind.html#AEN2601"
+>14.4. <A
+HREF="winbind.html#AEN2497"
 >How Winbind Works</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.4.1. <A
-HREF="winbind.html#AEN2606"
+>14.4.1. <A
+HREF="winbind.html#AEN2502"
 >Microsoft Remote Procedure Calls</A
 ></DT
 ><DT
->16.4.2. <A
-HREF="winbind.html#AEN2610"
+>14.4.2. <A
+HREF="winbind.html#AEN2506"
 >Microsoft Active Directory Services</A
 ></DT
 ><DT
->16.4.3. <A
-HREF="winbind.html#AEN2613"
+>14.4.3. <A
+HREF="winbind.html#AEN2509"
 >Name Service Switch</A
 ></DT
 ><DT
->16.4.4. <A
-HREF="winbind.html#AEN2629"
+>14.4.4. <A
+HREF="winbind.html#AEN2525"
 >Pluggable Authentication Modules</A
 ></DT
 ><DT
->16.4.5. <A
-HREF="winbind.html#AEN2637"
+>14.4.5. <A
+HREF="winbind.html#AEN2533"
 >User and Group ID Allocation</A
 ></DT
 ><DT
->16.4.6. <A
-HREF="winbind.html#AEN2641"
+>14.4.6. <A
+HREF="winbind.html#AEN2537"
 >Result Caching</A
 ></DT
 ></DL
 ></DD
 ><DT
->16.5. <A
-HREF="winbind.html#AEN2644"
+>14.5. <A
+HREF="winbind.html#AEN2540"
 >Installation and Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.5.1. <A
-HREF="winbind.html#AEN2649"
+>14.5.1. <A
+HREF="winbind.html#AEN2545"
 >Introduction</A
 ></DT
 ><DT
->16.5.2. <A
-HREF="winbind.html#AEN2662"
+>14.5.2. <A
+HREF="winbind.html#AEN2558"
 >Requirements</A
 ></DT
 ><DT
->16.5.3. <A
-HREF="winbind.html#AEN2676"
+>14.5.3. <A
+HREF="winbind.html#AEN2572"
 >Testing Things Out</A
 ></DT
 ></DL
 ></DD
 ><DT
->16.6. <A
-HREF="winbind.html#AEN2901"
+>14.6. <A
+HREF="winbind.html#AEN2797"
 >Limitations</A
 ></DT
 ><DT
->16.7. <A
-HREF="winbind.html#AEN2911"
+>14.7. <A
+HREF="winbind.html#AEN2807"
 >Conclusion</A
 ></DT
 ></DL
 ></DD
 ><DT
+>15. <A
+HREF="advancednetworkmanagement.html"
+>Advanced Network Manangement</A
+></DT
+><DD
+><DL
+><DT
+>15.1. <A
+HREF="advancednetworkmanagement.html#AEN2822"
+>Configuring Samba Share Access Controls</A
+></DT
+><DD
+><DL
+><DT
+>15.1.1. <A
+HREF="advancednetworkmanagement.html#AEN2832"
+>Share Permissions Management</A
+></DT
+></DL
+></DD
+><DT
+>15.2. <A
+HREF="advancednetworkmanagement.html#AEN2860"
+>Remote Server Administration</A
+></DT
+><DT
+>15.3. <A
+HREF="advancednetworkmanagement.html#AEN2877"
+>Network Logon Script Magic</A
+></DT
+></DL
+></DD
+><DT
+>16. <A
+HREF="policymgmt.html"
+>System and Account Policies</A
+></DT
+><DD
+><DL
+><DT
+>16.1. <A
+HREF="policymgmt.html#AEN2892"
+>Creating and Managing System Policies</A
+></DT
+><DD
+><DL
+><DT
+>16.1.1. <A
+HREF="policymgmt.html#AEN2906"
+>Windows 9x/Me Policies</A
+></DT
+><DT
+>16.1.2. <A
+HREF="policymgmt.html#AEN2918"
+>Windows NT4 Style Policy Files</A
+></DT
+><DT
+>16.1.3. <A
+HREF="policymgmt.html#AEN2936"
+>MS Windows 200x / XP Professional Policies</A
+></DT
+></DL
+></DD
+><DT
+>16.2. <A
+HREF="policymgmt.html#AEN2965"
+>Managing Account/User Policies</A
+></DT
+><DD
+><DL
+><DT
+>16.2.1. <A
+HREF="policymgmt.html#AEN2980"
+>With Windows NT4/200x</A
+></DT
+><DT
+>16.2.2. <A
+HREF="policymgmt.html#AEN2983"
+>With a Samba PDC</A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
 >17. <A
-HREF="integrate-ms-networks.html"
->Integrating MS Windows networks with Samba</A
+HREF="profilemgmt.html"
+>Desktop Profile Management</A
 ></DT
 ><DD
 ><DL
 ><DT
 >17.1. <A
-HREF="integrate-ms-networks.html#AEN2932"
->Name Resolution in a pure Unix/Linux world</A
+HREF="profilemgmt.html#AEN2998"
+>Roaming Profiles</A
 ></DT
 ><DD
 ><DL
 ><DT
 >17.1.1. <A
-HREF="integrate-ms-networks.html#AEN2948"
-><TT
-CLASS="FILENAME"
->/etc/hosts</TT
-></A
+HREF="profilemgmt.html#AEN3006"
+>Samba Configuration for Profile Handling</A
 ></DT
 ><DT
 >17.1.2. <A
-HREF="integrate-ms-networks.html#AEN2964"
-><TT
-CLASS="FILENAME"
->/etc/resolv.conf</TT
-></A
+HREF="profilemgmt.html#AEN3031"
+>Windows Client Profile Configuration Information</A
 ></DT
 ><DT
 >17.1.3. <A
-HREF="integrate-ms-networks.html#AEN2975"
-><TT
-CLASS="FILENAME"
->/etc/host.conf</TT
-></A
+HREF="profilemgmt.html#AEN3151"
+>Sharing Profiles between W9x/Me and NT4/200x/XP workstations</A
 ></DT
 ><DT
 >17.1.4. <A
-HREF="integrate-ms-networks.html#AEN2983"
-><TT
-CLASS="FILENAME"
->/etc/nsswitch.conf</TT
-></A
+HREF="profilemgmt.html#AEN3158"
+>Profile Migration from Windows NT4/200x Server to Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
 >17.2. <A
-HREF="integrate-ms-networks.html#AEN2995"
->Name resolution as used within MS Windows networking</A
+HREF="profilemgmt.html#AEN3196"
+>Mandatory profiles</A
 ></DT
-><DD
-><DL
 ><DT
->17.2.1. <A
-HREF="integrate-ms-networks.html#AEN3007"
->The NetBIOS Name Cache</A
+>17.3. <A
+HREF="profilemgmt.html#AEN3203"
+>Creating/Managing Group Profiles</A
 ></DT
 ><DT
->17.2.2. <A
-HREF="integrate-ms-networks.html#AEN3012"
->The LMHOSTS file</A
+>17.4. <A
+HREF="profilemgmt.html#AEN3209"
+>Default Profile for Windows Users</A
 ></DT
+><DD
+><DL
 ><DT
->17.2.3. <A
-HREF="integrate-ms-networks.html#AEN3020"
->HOSTS file</A
+>17.4.1. <A
+HREF="profilemgmt.html#AEN3213"
+>MS Windows 9x/Me</A
 ></DT
 ><DT
->17.2.4. <A
-HREF="integrate-ms-networks.html#AEN3025"
->DNS Lookup</A
+>17.4.2. <A
+HREF="profilemgmt.html#AEN3225"
+>MS Windows NT4 Workstation</A
 ></DT
 ><DT
->17.2.5. <A
-HREF="integrate-ms-networks.html#AEN3028"
->WINS Lookup</A
+>17.4.3. <A
+HREF="profilemgmt.html#AEN3279"
+>MS Windows 200x/XP</A
 ></DT
 ></DL
 ></DD
@@ -637,94 +649,107 @@ HREF="integrate-ms-networks.html#AEN3028"
 ></DD
 ><DT
 >18. <A
-HREF="improved-browsing.html"
->Improved browsing in samba</A
+HREF="pam.html"
+>PAM Configuration for Centrally Managed Authentication</A
 ></DT
 ><DD
 ><DL
 ><DT
 >18.1. <A
-HREF="improved-browsing.html#AEN3047"
->Overview of browsing</A
+HREF="pam.html#AEN3332"
+>Samba and PAM</A
 ></DT
 ><DT
 >18.2. <A
-HREF="improved-browsing.html#AEN3052"
->Browsing support in samba</A
+HREF="pam.html#AEN3383"
+>Distributed Authentication</A
 ></DT
 ><DT
 >18.3. <A
-HREF="improved-browsing.html#AEN3060"
->Problem resolution</A
+HREF="pam.html#AEN3388"
+>PAM Configuration in smb.conf</A
 ></DT
+></DL
+></DD
 ><DT
->18.4. <A
-HREF="improved-browsing.html#AEN3069"
->Browsing across subnets</A
+>19. <A
+HREF="vfs.html"
+>Stackable VFS modules</A
 ></DT
 ><DD
 ><DL
 ><DT
->18.4.1. <A
-HREF="improved-browsing.html#AEN3074"
->How does cross subnet browsing work ?</A
+>19.1. <A
+HREF="vfs.html#AEN3423"
+>Introduction and configuration</A
 ></DT
-></DL
-></DD
 ><DT
->18.5. <A
-HREF="improved-browsing.html#AEN3109"
->Setting up a WINS server</A
+>19.2. <A
+HREF="vfs.html#AEN3432"
+>Included modules</A
 ></DT
+><DD
+><DL
 ><DT
->18.6. <A
-HREF="improved-browsing.html#AEN3128"
->Setting up Browsing in a WORKGROUP</A
+>19.2.1. <A
+HREF="vfs.html#AEN3434"
+>audit</A
 ></DT
 ><DT
->18.7. <A
-HREF="improved-browsing.html#AEN3146"
->Setting up Browsing in a DOMAIN</A
+>19.2.2. <A
+HREF="vfs.html#AEN3442"
+>extd_audit</A
 ></DT
 ><DT
->18.8. <A
-HREF="improved-browsing.html#AEN3156"
->Forcing samba to be the master</A
+>19.2.3. <A
+HREF="vfs.html#AEN3446"
+>recycle</A
 ></DT
 ><DT
->18.9. <A
-HREF="improved-browsing.html#AEN3165"
->Making samba the domain master</A
+>19.2.4. <A
+HREF="vfs.html#AEN3483"
+>netatalk</A
 ></DT
+></DL
+></DD
 ><DT
->18.10. <A
-HREF="improved-browsing.html#AEN3183"
->Note about broadcast addresses</A
+>19.3. <A
+HREF="vfs.html#AEN3490"
+>VFS modules available elsewhere</A
 ></DT
+><DD
+><DL
 ><DT
->18.11. <A
-HREF="improved-browsing.html#AEN3186"
->Multiple interfaces</A
+>19.3.1. <A
+HREF="vfs.html#AEN3494"
+>DatabaseFS</A
 ></DT
+><DT
+>19.3.2. <A
+HREF="vfs.html#AEN3502"
+>vscan</A
+></DT
+></DL
+></DD
 ></DL
 ></DD
 ><DT
->19. <A
+>20. <A
 HREF="msdfs.html"
 >Hosting a Microsoft Distributed File System tree on Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.1. <A
-HREF="msdfs.html#AEN3200"
+>20.1. <A
+HREF="msdfs.html#AEN3518"
 >Instructions</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.1.1. <A
-HREF="msdfs.html#AEN3235"
+>20.1.1. <A
+HREF="msdfs.html#AEN3553"
 >Notes</A
 ></DT
 ></DL
@@ -732,116 +757,216 @@ HREF="msdfs.html#AEN3235"
 ></DL
 ></DD
 ><DT
->20. <A
-HREF="vfs.html"
->Stackable VFS modules</A
+>21. <A
+HREF="integrate-ms-networks.html"
+>Integrating MS Windows networks with Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.1. <A
-HREF="vfs.html#AEN3259"
->Introduction and configuration</A
+>21.1. <A
+HREF="integrate-ms-networks.html#AEN3580"
+>Name Resolution in a pure Unix/Linux world</A
 ></DT
+><DD
+><DL
 ><DT
->20.2. <A
-HREF="vfs.html#AEN3268"
->Included modules</A
+>21.1.1. <A
+HREF="integrate-ms-networks.html#AEN3596"
+><TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+></A
+></DT
+><DT
+>21.1.2. <A
+HREF="integrate-ms-networks.html#AEN3612"
+><TT
+CLASS="FILENAME"
+>/etc/resolv.conf</TT
+></A
+></DT
+><DT
+>21.1.3. <A
+HREF="integrate-ms-networks.html#AEN3623"
+><TT
+CLASS="FILENAME"
+>/etc/host.conf</TT
+></A
+></DT
+><DT
+>21.1.4. <A
+HREF="integrate-ms-networks.html#AEN3631"
+><TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf</TT
+></A
+></DT
+></DL
+></DD
+><DT
+>21.2. <A
+HREF="integrate-ms-networks.html#AEN3643"
+>Name resolution as used within MS Windows networking</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.2.1. <A
-HREF="vfs.html#AEN3270"
->audit</A
+>21.2.1. <A
+HREF="integrate-ms-networks.html#AEN3655"
+>The NetBIOS Name Cache</A
 ></DT
 ><DT
->20.2.2. <A
-HREF="vfs.html#AEN3278"
->recycle</A
+>21.2.2. <A
+HREF="integrate-ms-networks.html#AEN3660"
+>The LMHOSTS file</A
 ></DT
 ><DT
->20.2.3. <A
-HREF="vfs.html#AEN3315"
->netatalk</A
+>21.2.3. <A
+HREF="integrate-ms-networks.html#AEN3668"
+>HOSTS file</A
+></DT
+><DT
+>21.2.4. <A
+HREF="integrate-ms-networks.html#AEN3673"
+>DNS Lookup</A
+></DT
+><DT
+>21.2.5. <A
+HREF="integrate-ms-networks.html#AEN3676"
+>WINS Lookup</A
 ></DT
 ></DL
 ></DD
+></DL
+></DD
 ><DT
->20.3. <A
-HREF="vfs.html#AEN3322"
->VFS modules available elsewhere</A
+>22. <A
+HREF="improved-browsing.html"
+>Improved browsing in samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.3.1. <A
-HREF="vfs.html#AEN3326"
->DatabaseFS</A
+>22.1. <A
+HREF="improved-browsing.html#AEN3695"
+>Overview of browsing</A
 ></DT
 ><DT
->20.3.2. <A
-HREF="vfs.html#AEN3334"
->vscan</A
+>22.2. <A
+HREF="improved-browsing.html#AEN3701"
+>Browsing support in samba</A
+></DT
+><DT
+>22.3. <A
+HREF="improved-browsing.html#AEN3714"
+>Problem resolution</A
+></DT
+><DT
+>22.4. <A
+HREF="improved-browsing.html#AEN3725"
+>Browsing across subnets</A
+></DT
+><DD
+><DL
+><DT
+>22.4.1. <A
+HREF="improved-browsing.html#AEN3730"
+>How does cross subnet browsing work ?</A
 ></DT
 ></DL
 ></DD
+><DT
+>22.5. <A
+HREF="improved-browsing.html#AEN3765"
+>Setting up a WINS server</A
+></DT
+><DT
+>22.6. <A
+HREF="improved-browsing.html#AEN3785"
+>Setting up Browsing in a WORKGROUP</A
+></DT
+><DT
+>22.7. <A
+HREF="improved-browsing.html#AEN3808"
+>Setting up Browsing in a DOMAIN</A
+></DT
+><DT
+>22.8. <A
+HREF="improved-browsing.html#BROWSE-FORCE-MASTER"
+>Forcing samba to be the master</A
+></DT
+><DT
+>22.9. <A
+HREF="improved-browsing.html#AEN3843"
+>Making samba the domain master</A
+></DT
+><DT
+>22.10. <A
+HREF="improved-browsing.html#AEN3865"
+>Note about broadcast addresses</A
+></DT
+><DT
+>22.11. <A
+HREF="improved-browsing.html#AEN3868"
+>Multiple interfaces</A
+></DT
 ></DL
 ></DD
 ><DT
->21. <A
+>23. <A
 HREF="securing-samba.html"
 >Securing Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->21.1. <A
-HREF="securing-samba.html#AEN3348"
+>23.1. <A
+HREF="securing-samba.html#AEN3884"
 >Introduction</A
 ></DT
 ><DT
->21.2. <A
-HREF="securing-samba.html#AEN3351"
+>23.2. <A
+HREF="securing-samba.html#AEN3887"
 >Using host based protection</A
 ></DT
 ><DT
->21.3. <A
-HREF="securing-samba.html#AEN3358"
+>23.3. <A
+HREF="securing-samba.html#AEN3894"
 >Using interface protection</A
 ></DT
 ><DT
->21.4. <A
-HREF="securing-samba.html#AEN3367"
+>23.4. <A
+HREF="securing-samba.html#AEN3903"
 >Using a firewall</A
 ></DT
 ><DT
->21.5. <A
-HREF="securing-samba.html#AEN3374"
+>23.5. <A
+HREF="securing-samba.html#AEN3910"
 >Using a IPC$ share deny</A
 ></DT
 ><DT
->21.6. <A
-HREF="securing-samba.html#AEN3383"
+>23.6. <A
+HREF="securing-samba.html#AEN3919"
 >Upgrading Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->22. <A
+>24. <A
 HREF="unicode.html"
 >Unicode/Charsets</A
 ></DT
 ><DD
 ><DL
 ><DT
->22.1. <A
-HREF="unicode.html#AEN3397"
+>24.1. <A
+HREF="unicode.html#AEN3933"
 >What are charsets and unicode?</A
 ></DT
 ><DT
->22.2. <A
-HREF="unicode.html#AEN3406"
+>24.2. <A
+HREF="unicode.html#AEN3942"
 >Samba and charsets</A
 ></DT
 ></DL
@@ -884,7 +1009,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="advancednetworkmanagement.html"
+HREF="unix-permissions.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -904,7 +1029,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->System Policies</TD
+>UNIX Permission Bits and Windows NT Access Control Lists</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/other-clients.html b/docs/htmldocs/other-clients.html
index 3182c85583..5b0819f912 100644
--- a/docs/htmldocs/other-clients.html
+++ b/docs/htmldocs/other-clients.html
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="OTHER-CLIENTS"
 ></A
->Chapter 25. Samba and other CIFS clients</H1
+>Chapter 29. Samba and other CIFS clients</H1
 ><P
 >This chapter contains client-specific information.</P
 ><DIV
@@ -82,8 +82,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3590"
->25.1. Macintosh clients?</A
+NAME="AEN4196"
+>29.1. Macintosh clients?</A
 ></H1
 ><P
 >Yes. <A
@@ -128,16 +128,16 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3599"
->25.2. OS2 Client</A
+NAME="AEN4205"
+>29.2. OS2 Client</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3601"
->25.2.1. How can I configure OS/2 Warp Connect or 
+NAME="AEN4207"
+>29.2.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
 ><P
@@ -195,8 +195,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3616"
->25.2.2. How can I configure OS/2 Warp 3 (not Connect), 
+NAME="AEN4222"
+>29.2.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
 ><P
@@ -239,8 +239,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3625"
->25.2.3. Are there any other issues when OS/2 (any version) 
+NAME="AEN4231"
+>29.2.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
 ><P
@@ -261,8 +261,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3629"
->25.2.4. How do I get printer driver download working 
+NAME="AEN4235"
+>29.2.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
 ><P
@@ -308,16 +308,16 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3639"
->25.3. Windows for Workgroups</A
+NAME="AEN4245"
+>29.3. Windows for Workgroups</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3641"
->25.3.1. Use latest TCP/IP stack from Microsoft</A
+NAME="AEN4247"
+>29.3.1. Use latest TCP/IP stack from Microsoft</A
 ></H2
 ><P
 >Use the latest TCP/IP stack from microsoft if you use Windows
@@ -338,8 +338,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3646"
->25.3.2. Delete .pwl files after password change</A
+NAME="AEN4252"
+>29.3.2. Delete .pwl files after password change</A
 ></H2
 ><P
 >WfWg does a lousy job with passwords. I find that if I change my
@@ -358,8 +358,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3651"
->25.3.3. Configure WfW password handling</A
+NAME="AEN4257"
+>29.3.3. Configure WfW password handling</A
 ></H2
 ><P
 >There is a program call admincfg.exe
@@ -377,8 +377,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3655"
->25.3.4. Case handling of passwords</A
+NAME="AEN4261"
+>29.3.4. Case handling of passwords</A
 ></H2
 ><P
 >Windows for Workgroups uppercases the password before sending it to the server. Unix passwords can be case-sensitive though. Check the <A
@@ -395,8 +395,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3660"
->25.3.5. Use TCP/IP as default protocol</A
+NAME="AEN4266"
+>29.3.5. Use TCP/IP as default protocol</A
 ></H2
 ><P
 >To support print queue reporting you may find
@@ -411,8 +411,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3663"
->25.4. Windows '95/'98</A
+NAME="AEN4269"
+>29.4. Windows '95/'98</A
 ></H1
 ><P
 >When using Windows 95 OEM SR2 the following updates are recommended where Samba
@@ -459,8 +459,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3679"
->25.5. Windows 2000 Service Pack 2</A
+NAME="AEN4285"
+>29.5. Windows 2000 Service Pack 2</A
 ></H1
 ><P
 > 
@@ -526,15 +526,49 @@ for the profile. This default ACL includes </P
 CLASS="COMMAND"
 >DOMAIN\user 	"Full Control"</B
 ></P
+><DIV
+CLASS="NOTE"
 ><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOTE : This bug does not occur when using winbind to
-create accounts on the Samba host for Domain users.</I
-></SPAN
 ></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>This bug does not occur when using winbind to
+create accounts on the Samba host for Domain users.</P
+></TD
+></TR
+></TABLE
+></DIV
+></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN4302"
+>29.6. Windows NT 3.1</A
+></H1
+><P
+>If you have problems communicating across routers with Windows 
+NT 3.1 workstations, read <A
+HREF="http://support.microsoft.com/default.aspx?scid=kb;[LN];Q103765"
+TARGET="_top"
+>this Microsoft Knowledge Base article</A
+>.&#13;</P
 ></DIV
 ></DIV
 ><DIV
diff --git a/docs/htmldocs/pam.html b/docs/htmldocs/pam.html
index 85e080167e..0ae5e85472 100644
--- a/docs/htmldocs/pam.html
+++ b/docs/htmldocs/pam.html
@@ -2,8 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Configuring PAM for distributed but centrally 
-managed authentication</TITLE
+>PAM Configuration for Centrally Managed Authentication</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
@@ -14,11 +13,11 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Group mapping HOWTO"
-HREF="groupmapping.html"><LINK
+TITLE="Desktop Profile Management"
+HREF="profilemgmt.html"><LINK
 REL="NEXT"
-TITLE="Printing Support"
-HREF="printing.html"></HEAD
+TITLE="Stackable VFS modules"
+HREF="vfs.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -46,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="groupmapping.html"
+HREF="profilemgmt.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -60,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="printing.html"
+HREF="vfs.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -75,15 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="PAM"
 ></A
->Chapter 13. Configuring PAM for distributed but centrally 
-managed authentication</H1
+>Chapter 18. PAM Configuration for Centrally Managed Authentication</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1866"
->13.1. Samba and PAM</A
+NAME="AEN3332"
+>18.1. Samba and PAM</A
 ></H1
 ><P
 >A number of Unix systems (eg: Sun Solaris), as well as the 
@@ -150,7 +148,7 @@ CLASS="FILENAME"
 	
 	<PRE
 CLASS="PROGRAMLISTING"
->	eg: "auth       required      /other_path/pam_strange_module.so"
+>	auth       required      /other_path/pam_strange_module.so
 	</PRE
 >
 	</P
@@ -192,10 +190,16 @@ CLASS="PROGRAMLISTING"
 >PAM allows use of replacable modules. Those available on a 
 sample system include:</P
 ><P
-><PRE
+><SAMP
+CLASS="PROMPT"
+>$</SAMP
+><KBD
+CLASS="USERINPUT"
+>/bin/ls /lib/security</KBD
+>
+<PRE
 CLASS="PROGRAMLISTING"
->	$ /bin/ls /lib/security
-	pam_access.so    pam_ftp.so          pam_limits.so     
+>	pam_access.so    pam_ftp.so          pam_limits.so     
 	pam_ncp_auth.so  pam_rhosts_auth.so  pam_stress.so     
 	pam_cracklib.so  pam_group.so        pam_listfile.so   
 	pam_nologin.so   pam_rootok.so       pam_tally.so      
@@ -289,10 +293,10 @@ CLASS="PROGRAMLISTING"
 >	#%PAM-1.0
 	# The PAM configuration file for the `samba' service
 	#
-	auth       required     /lib/security/pam_pwdb.so nullok nodelay shadow audit
-	account    required     /lib/security/pam_pwdb.so audit nodelay
-	session    required     /lib/security/pam_pwdb.so nodelay
-	password   required     /lib/security/pam_pwdb.so shadow md5</PRE
+	auth       required     pam_pwdb.so nullok nodelay shadow audit
+	account    required     pam_pwdb.so audit nodelay
+	session    required     pam_pwdb.so nodelay
+	password   required     pam_pwdb.so shadow md5</PRE
 ></P
 ><P
 >In the following example the decision has been made to use the 
@@ -306,10 +310,10 @@ CLASS="PROGRAMLISTING"
 >	#%PAM-1.0
 	# The PAM configuration file for the `samba' service
 	#
-	auth       required     /lib/security/pam_smbpass.so nodelay
-	account    required     /lib/security/pam_pwdb.so audit nodelay
-	session    required     /lib/security/pam_pwdb.so nodelay
-	password   required     /lib/security/pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf</PRE
+	auth       required     pam_smbpass.so nodelay
+	account    required     pam_pwdb.so audit nodelay
+	session    required     pam_pwdb.so nodelay
+	password   required     pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf</PRE
 ></P
 ><DIV
 CLASS="NOTE"
@@ -359,8 +363,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1915"
->13.2. Distributed Authentication</A
+NAME="AEN3383"
+>18.2. Distributed Authentication</A
 ></H1
 ><P
 >The astute administrator will realize from this that the 
@@ -385,8 +389,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1920"
->13.3. PAM Configuration in smb.conf</A
+NAME="AEN3388"
+>18.3. PAM Configuration in smb.conf</A
 ></H1
 ><P
 >There is an option in smb.conf called <A
@@ -437,7 +441,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="groupmapping.html"
+HREF="profilemgmt.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -455,7 +459,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="printing.html"
+HREF="vfs.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -465,7 +469,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Group mapping HOWTO</TD
+>Desktop Profile Management</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -479,7 +483,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Printing Support</TD
+>Stackable VFS modules</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/passdb.html b/docs/htmldocs/passdb.html
index 8a7c26b640..127a748189 100644
--- a/docs/htmldocs/passdb.html
+++ b/docs/htmldocs/passdb.html
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN244"
+NAME="AEN321"
 >3.1. Introduction</A
 ></H1
 ><P
@@ -121,7 +121,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN251"
+NAME="AEN328"
 >3.2. Important Notes About Security</A
 ></H1
 ><P
@@ -284,7 +284,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN277"
+NAME="AEN354"
 >3.2.1. Advantages of SMB Encryption</A
 ></H2
 ><P
@@ -310,7 +310,7 @@ BORDER="0"
 ></TR
 ><TR
 ><TD
->Encrypted password support allows auto-matic share
+>Encrypted password support allows automatic share
 			(resource) reconnects.</TD
 ></TR
 ></TBODY
@@ -323,7 +323,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN283"
+NAME="AEN360"
 >3.2.2. Advantages of non-encrypted passwords</A
 ></H2
 ><P
@@ -358,7 +358,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN289"
+NAME="AEN366"
 >3.3. The smbpasswd Command</A
 ></H1
 ><P
@@ -461,7 +461,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN320"
+NAME="AEN397"
 >3.4. Plain text</A
 ></H1
 ><P
@@ -481,7 +481,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN325"
+NAME="AEN402"
 >3.5. TDB</A
 ></H1
 ><P
@@ -494,7 +494,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN328"
+NAME="AEN405"
 >3.6. LDAP</A
 ></H1
 ><DIV
@@ -502,7 +502,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN330"
+NAME="AEN407"
 >3.6.1. Introduction</A
 ></H2
 ><P
@@ -570,7 +570,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN350"
+NAME="AEN427"
 >3.6.2. Introduction</A
 ></H2
 ><P
@@ -679,7 +679,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN379"
+NAME="AEN456"
 >3.6.3. Supported LDAP Servers</A
 ></H2
 ><P
@@ -690,12 +690,12 @@ and client SDK. However, due to lack of testing so far, there are bound
 to be compile errors and bugs.  These should not be hard to fix.
 If you are so inclined, please be sure to forward all patches to
 <A
-HREF="samba-patches@samba.org"
+HREF="mailto:samba-patches@samba.org"
 TARGET="_top"
 >samba-patches@samba.org</A
 > and
 <A
-HREF="jerry@samba.org"
+HREF="mailto:jerry@samba.org"
 TARGET="_top"
 >jerry@samba.org</A
 >.</P
@@ -705,7 +705,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN384"
+NAME="AEN461"
 >3.6.4. Schema and Relationship to the RFC 2307 posixAccount</A
 ></H2
 ><P
@@ -730,7 +730,7 @@ CLASS="PROGRAMLISTING"
 owned by the Samba Team and as such is legal to be openly published.
 If you translate the schema to be used with Netscape DS, please
 submit the modified schema file as a patch to <A
-HREF="jerry@samba.org"
+HREF="mailto:jerry@samba.org"
 TARGET="_top"
 >jerry@samba.org</A
 ></P
@@ -762,7 +762,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN396"
+NAME="AEN473"
 >3.6.5. Configuring Samba with LDAP</A
 ></H2
 ><DIV
@@ -770,7 +770,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN398"
+NAME="AEN475"
 >3.6.5.1. OpenLDAP configuration</A
 ></H3
 ><P
@@ -780,9 +780,9 @@ server, first copy the samba.schema file to slapd's configuration directory.</P
 ><SAMP
 CLASS="PROMPT"
 >root# </SAMP
-><B
-CLASS="COMMAND"
->cp samba.schema /etc/openldap/schema/</B
+><KBD
+CLASS="USERINPUT"
+>cp samba.schema /etc/openldap/schema/</KBD
 ></P
 ><P
 >Next, include the <TT
@@ -852,7 +852,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN415"
+NAME="AEN492"
 >3.6.5.2. Configuring Samba</A
 ></H3
 ><P
@@ -968,7 +968,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN443"
+NAME="AEN520"
 >3.6.6. Accounts and Groups management</A
 ></H2
 ><P
@@ -993,7 +993,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN448"
+NAME="AEN525"
 >3.6.7. Security and sambaAccount</A
 ></H2
 ><P
@@ -1072,7 +1072,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN468"
+NAME="AEN545"
 >3.6.8. LDAP specials attributes for sambaAccounts</A
 ></H2
 ><P
@@ -1279,7 +1279,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN538"
+NAME="AEN615"
 >3.6.9. Example LDIF Entries for a sambaAccount</A
 ></H2
 ><P
@@ -1338,7 +1338,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN546"
+NAME="AEN623"
 >3.7. MySQL</A
 ></H1
 ><DIV
@@ -1346,29 +1346,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN548"
->3.7.1. Building</A
-></H2
-><P
->To build the plugin, run <B
-CLASS="COMMAND"
->make bin/pdb_mysql.so</B
->
-in the <TT
-CLASS="FILENAME"
->source/</TT
-> directory of samba distribution. </P
-><P
->Next, copy pdb_mysql.so to any location you want. I 
-strongly recommend installing it in $PREFIX/lib or /usr/lib/samba/</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN554"
->3.7.2. Creating the database</A
+NAME="AEN625"
+>3.7.1. Creating the database</A
 ></H2
 ><P
 >You either can set up your own table and specify the field names to pdb_mysql (see below
@@ -1403,8 +1382,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN564"
->3.7.3. Configuring</A
+NAME="AEN635"
+>3.7.2. Configuring</A
 ></H2
 ><P
 >This plugin lacks some good documentation, but here is some short info:</P
@@ -1418,7 +1397,7 @@ CLASS="FILENAME"
 >:
 <PRE
 CLASS="PROGRAMLISTING"
->passdb backend = [other-plugins] plugin:/location/to/pdb_mysql.so:identifier [other-plugins]</PRE
+>passdb backend = [other-plugins] mysql:identifier [other-plugins]</PRE
 ></P
 ><P
 >The identifier can be any string you like, as long as it doesn't collide with 
@@ -1514,8 +1493,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN581"
->3.7.4. Using plaintext passwords or encrypted password</A
+NAME="AEN652"
+>3.7.3. Using plaintext passwords or encrypted password</A
 ></H2
 ><P
 >I strongly discourage the use of plaintext passwords, however, you can use them:</P
@@ -1529,8 +1508,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN586"
->3.7.5. Getting non-column data from the table</A
+NAME="AEN657"
+>3.7.4. Getting non-column data from the table</A
 ></H2
 ><P
 >It is possible to have not all data in the database and making some 'constant'.</P
@@ -1555,57 +1534,30 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN594"
->3.8. Passdb XML plugin</A
+NAME="AEN665"
+>3.8. XML</A
 ></H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN596"
->3.8.1. Building</A
-></H2
 ><P
 >This module requires libxml2 to be installed.</P
 ><P
->To build pdb_xml, run: <B
-CLASS="COMMAND"
->make bin/pdb_xml.so</B
-> in 
-the directory <TT
-CLASS="FILENAME"
->source/</TT
->. </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN602"
->3.8.2. Usage</A
-></H2
-><P
 >The usage of pdb_xml is pretty straightforward. To export data, use:
 
-<B
-CLASS="COMMAND"
->pdbedit -e plugin:/usr/lib/samba/pdb_xml.so:filename</B
+<KBD
+CLASS="USERINPUT"
+>pdbedit -e xml:filename</KBD
 >
 
 (where filename is the name of the file to put the data in)</P
 ><P
 >To import data, use:
-<B
-CLASS="COMMAND"
->pdbedit -i plugin:/usr/lib/samba/pdb_xml.so:filename -e current-pdb</B
+<KBD
+CLASS="USERINPUT"
+>pdbedit -i xml:filename -e current-pdb</KBD
 >
 
 Where filename is the name to read the data from and current-pdb to put it in.</P
 ></DIV
 ></DIV
-></DIV
 ><DIV
 CLASS="NAVFOOTER"
 ><HR
diff --git a/docs/htmldocs/pdbedit.8.html b/docs/htmldocs/pdbedit.8.html
index ee7b980211..5fb41fba4b 100644
--- a/docs/htmldocs/pdbedit.8.html
+++ b/docs/htmldocs/pdbedit.8.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >pdbedit</B
->  [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-b passdb-backend] [-d debuglevel] [-s configfile] [-P account-policy] [-V value]</P
+>  [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-g] [-b passdb-backend] [-g] [-d debuglevel] [-s configfile] [-P account-policy] [-C value]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30"
+NAME="AEN32"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -70,7 +70,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN39"
+NAME="AEN41"
 ></A
 ><H2
 >OPTIONS</H2
@@ -336,6 +336,44 @@ CLASS="COMMAND"
 ></P
 ></DD
 ><DT
+>-g</DT
+><DD
+><P
+>If you specify <VAR
+CLASS="PARAMETER"
+>-g</VAR
+>,
+		then <VAR
+CLASS="PARAMETER"
+>-i in-backend -e out-backend</VAR
+>
+		applies to the group mapping instead of the user database.
+
+		</P
+><P
+>This option will ease migration from one passdb backend to
+		another and will ease backing up.</P
+></DD
+><DT
+>-g</DT
+><DD
+><P
+>If you specify <VAR
+CLASS="PARAMETER"
+>-g</VAR
+>,
+		then <VAR
+CLASS="PARAMETER"
+>-i in-backend -e out-backend</VAR
+>
+		applies to the group mapping instead of the user database.
+
+		</P
+><P
+>This option will ease migration from one passdb backend to
+		another and will ease backing up.</P
+></DD
+><DT
 >-b passdb-backend</DT
 ><DD
 ><P
@@ -367,7 +405,7 @@ CLASS="PROGRAMLISTING"
 ></P
 ></DD
 ><DT
->-V account-policy-value</DT
+>-C account-policy-value</DT
 ><DD
 ><P
 >Sets an account policy to a specified value. 
@@ -380,7 +418,7 @@ CLASS="PARAMETER"
 ><P
 >Example: <B
 CLASS="COMMAND"
->pdbedit -P "bad lockout attempt" -V 3</B
+>pdbedit -P "bad lockout attempt" -C 3</B
 ></P
 ><P
 ><PRE
@@ -390,6 +428,42 @@ account policy value for bad lockout attempt is now 3</PRE
 ></P
 ></DD
 ><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
+><DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
 >-d|--debug=debuglevel</DT
 ><DD
 ><P
@@ -429,30 +503,15 @@ CLASS="FILENAME"
 > file.</P
 ></DD
 ><DT
->-h|--help</DT
+>-l|--logfile=logbasename</DT
 ><DD
 ><P
->Print a summary of command line options.</P
-></DD
-><DT
->-s &#60;configuration file&#62;</DT
-><DD
-><P
->The file specified contains the 
-configuration details required by the server.  The 
-information in this file includes server-specific
-information such as what printcap file to use, as well 
-as descriptions of all the services that the server is 
-to provide. See <A
-HREF="smb.conf.5.html"
-TARGET="_top"
-><TT
-CLASS="FILENAME"
->smb.conf(5)</TT
-></A
-> for more information.
-The default configuration file name is determined at 
-compile time.</P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ></DL
 ></DIV
@@ -460,7 +519,7 @@ compile time.</P
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN184"
+NAME="AEN210"
 ></A
 ><H2
 >NOTES</H2
@@ -470,7 +529,7 @@ NAME="AEN184"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN187"
+NAME="AEN213"
 ></A
 ><H2
 >VERSION</H2
@@ -481,7 +540,7 @@ NAME="AEN187"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN190"
+NAME="AEN216"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -503,7 +562,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN199"
+NAME="AEN225"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/portability.html b/docs/htmldocs/portability.html
index 6efc264635..7f77ed065f 100644
--- a/docs/htmldocs/portability.html
+++ b/docs/htmldocs/portability.html
@@ -74,7 +74,7 @@ CLASS="CHAPTER"
 ><A
 NAME="PORTABILITY"
 ></A
->Chapter 24. Portability</H1
+>Chapter 28. Portability</H1
 ><P
 >Samba works on a wide range of platforms but the interface all the 
 platforms provide is not always compatible. This chapter contains 
@@ -84,8 +84,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3525"
->24.1. HPUX</A
+NAME="AEN4127"
+>28.1. HPUX</A
 ></H1
 ><P
 >HP's implementation of supplementary groups is, er, non-standard (for
@@ -114,8 +114,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3531"
->24.2. SCO Unix</A
+NAME="AEN4133"
+>28.2. SCO Unix</A
 ></H1
 ><P
 > 
@@ -131,8 +131,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3535"
->24.3. DNIX</A
+NAME="AEN4137"
+>28.3. DNIX</A
 ></H1
 ><P
 >DNIX has a problem with seteuid() and setegid(). These routines are
@@ -238,8 +238,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3564"
->24.4. RedHat Linux Rembrandt-II</A
+NAME="AEN4166"
+>28.4. RedHat Linux Rembrandt-II</A
 ></H1
 ><P
 >By default RedHat Rembrandt-II during installation adds an
@@ -262,16 +262,16 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3570"
->24.5. AIX</A
+NAME="AEN4172"
+>28.5. AIX</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3572"
->24.5.1. Sequential Read Ahead</A
+NAME="AEN4174"
+>28.5.1. Sequential Read Ahead</A
 ></H2
 ><P
 >Disabling Sequential Read Ahead using "vmtune -r 0" improves 
diff --git a/docs/htmldocs/printing.html b/docs/htmldocs/printing.html
index 7834e0d884..d30fa88b70 100644
--- a/docs/htmldocs/printing.html
+++ b/docs/htmldocs/printing.html
@@ -13,9 +13,8 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Configuring PAM for distributed but centrally 
-managed authentication"
-HREF="pam.html"><LINK
+TITLE="Configuring Group Mapping"
+HREF="groupmapping.html"><LINK
 REL="NEXT"
 TITLE="CUPS Printing Support"
 HREF="cups-printing.html"></HEAD
@@ -46,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="pam.html"
+HREF="groupmapping.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -75,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="PRINTING"
 ></A
->Chapter 14. Printing Support</H1
+>Chapter 12. Printing Support</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1946"
->14.1. Introduction</A
+NAME="AEN1711"
+>12.1. Introduction</A
 ></H1
 ><P
 >Beginning with the 2.2.0 release, Samba supports 
@@ -164,8 +163,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1968"
->14.2. Configuration</A
+NAME="AEN1733"
+>12.2. Configuration</A
 ></H1
 ><DIV
 CLASS="WARNING"
@@ -226,8 +225,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1976"
->14.2.1. Creating [print$]</A
+NAME="AEN1741"
+>12.2.1. Creating [print$]</A
 ></H2
 ><P
 >In order to support the uploading of printer driver 
@@ -353,14 +352,14 @@ Samba follows this model as well.</P
 >Next create the directory tree below the [print$] share 
 for each architecture you wish to support.</P
 ><P
-><PRE
-CLASS="PROGRAMLISTING"
+><SAMP
+CLASS="COMPUTEROUTPUT"
 >[print$]-----
         |-W32X86           ; "Windows NT x86"
         |-WIN40            ; "Windows 95/98"
         |-W32ALPHA         ; "Windows NT Alpha_AXP"
         |-W32MIPS          ; "Windows NT R4000"
-        |-W32PPC           ; "Windows NT PowerPC"</PRE
+        |-W32PPC           ; "Windows NT PowerPC"</SAMP
 ></P
 ><DIV
 CLASS="WARNING"
@@ -443,8 +442,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2011"
->14.2.2. Setting Drivers for Existing Printers</A
+NAME="AEN1776"
+>12.2.2. Setting Drivers for Existing Printers</A
 ></H2
 ><P
 >The initial listing of printers in the Samba host's 
@@ -515,8 +514,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2027"
->14.2.3. Support a large number of printers</A
+NAME="AEN1792"
+>12.2.3. Support a large number of printers</A
 ></H2
 ><P
 >One issue that has arisen during the development
@@ -535,13 +534,16 @@ setdriver command</B
 associated with an installed driver.  The following is example
 of how this could be accomplished:</P
 ><P
-><PRE
-CLASS="PROGRAMLISTING"
-> 
-<SAMP
+><SAMP
 CLASS="PROMPT"
 >$ </SAMP
->rpcclient pogo -U root%secret -c "enumdrivers"
+><KBD
+CLASS="USERINPUT"
+>rpcclient pogo -U root%secret -c "enumdrivers"</KBD
+>
+<PRE
+CLASS="PROGRAMLISTING"
+> 
 Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
  
 [Windows NT x86]
@@ -552,27 +554,34 @@ Printer Driver Info 1:
      Driver Name: [HP LaserJet 2100 Series PS]
  
 Printer Driver Info 1:
-     Driver Name: [HP LaserJet 4Si/4SiMX PS]
-				  
+     Driver Name: [HP LaserJet 4Si/4SiMX PS]</PRE
+>				  
 <SAMP
 CLASS="PROMPT"
 >$ </SAMP
->rpcclient pogo -U root%secret -c "enumprinters"
-Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
+><KBD
+CLASS="USERINPUT"
+>rpcclient pogo -U root%secret -c "enumprinters"</KBD
+>
+<PRE
+CLASS="PROGRAMLISTING"
+>Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
      flags:[0x800000]
      name:[\\POGO\hp-print]
      description:[POGO\\POGO\hp-print,NO DRIVER AVAILABLE FOR THIS PRINTER,]
      comment:[]
-				  
+				  </PRE
+>
 <SAMP
 CLASS="PROMPT"
 >$ </SAMP
->rpcclient pogo -U root%secret \
-<SAMP
-CLASS="PROMPT"
->&#62; </SAMP
-> -c "setdriver hp-print \"HP LaserJet 4000 Series PS\""
-Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
+><KBD
+CLASS="USERINPUT"
+>rpcclient pogo -U root%secret -c "setdriver hp-print \"HP LaserJet 4000 Series PS\""</KBD
+>
+<PRE
+CLASS="PROGRAMLISTING"
+>Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
 Successfully set hp-print to driver HP LaserJet 4000 Series PS.</PRE
 ></P
 ></DIV
@@ -581,8 +590,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2038"
->14.2.4. Adding New Printers via the Windows NT APW</A
+NAME="AEN1807"
+>12.2.4. Adding New Printers via the Windows NT APW</A
 ></H2
 ><P
 >By default, Samba offers all printer shares defined in <TT
@@ -736,8 +745,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2068"
->14.2.5. Samba and Printer Ports</A
+NAME="AEN1837"
+>12.2.5. Samba and Printer Ports</A
 ></H2
 ><P
 >Windows NT/2000 print servers associate a port with each printer.  These normally
@@ -771,8 +780,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2076"
->14.3. The Imprints Toolset</A
+NAME="AEN1845"
+>12.3. The Imprints Toolset</A
 ></H1
 ><P
 >The Imprints tool set provides a UNIX equivalent of the 
@@ -789,8 +798,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2080"
->14.3.1. What is Imprints?</A
+NAME="AEN1849"
+>12.3.1. What is Imprints?</A
 ></H2
 ><P
 >Imprints is a collection of tools for supporting the goals 
@@ -821,8 +830,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2090"
->14.3.2. Creating Printer Driver Packages</A
+NAME="AEN1859"
+>12.3.2. Creating Printer Driver Packages</A
 ></H2
 ><P
 >The process of creating printer driver packages is beyond
@@ -837,8 +846,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2093"
->14.3.3. The Imprints server</A
+NAME="AEN1862"
+>12.3.3. The Imprints server</A
 ></H2
 ><P
 >The Imprints server is really a database server that 
@@ -861,8 +870,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2097"
->14.3.4. The Installation Client</A
+NAME="AEN1866"
+>12.3.4. The Installation Client</A
 ></H2
 ><P
 >More information regarding the Imprints installation client 
@@ -955,16 +964,16 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2119"
->14.4. Diagnosis</A
+NAME="AEN1888"
+>12.4. Diagnosis</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2121"
->14.4.1. Introduction</A
+NAME="AEN1890"
+>12.4.1. Introduction</A
 ></H2
 ><P
 >This is a short description of how to debug printing problems with
@@ -1038,8 +1047,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2137"
->14.4.2. Debugging printer problems</A
+NAME="AEN1906"
+>12.4.2. Debugging printer problems</A
 ></H2
 ><P
 >One way to debug printing problems is to start by replacing these
@@ -1095,8 +1104,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2146"
->14.4.3. What printers do I have?</A
+NAME="AEN1915"
+>12.4.3. What printers do I have?</A
 ></H2
 ><P
 >You can use the 'testprns' program to check to see if the printer
@@ -1124,8 +1133,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2154"
->14.4.4. Setting up printcap and print servers</A
+NAME="AEN1923"
+>12.4.4. Setting up printcap and print servers</A
 ></H2
 ><P
 >You may need to set up some printcaps for your Samba system to use.
@@ -1208,8 +1217,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2182"
->14.4.5. Job sent, no output</A
+NAME="AEN1951"
+>12.4.5. Job sent, no output</A
 ></H2
 ><P
 >This is the most frustrating part of printing.  You may have sent the
@@ -1253,8 +1262,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2193"
->14.4.6. Job sent, strange output</A
+NAME="AEN1962"
+>12.4.6. Job sent, strange output</A
 ></H2
 ><P
 >Once you have the job printing, you can then start worrying about
@@ -1299,8 +1308,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2205"
->14.4.7. Raw PostScript printed</A
+NAME="AEN1974"
+>12.4.7. Raw PostScript printed</A
 ></H2
 ><P
 >This is a problem that is usually caused by either the print spooling
@@ -1314,8 +1323,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2208"
->14.4.8. Advanced Printing</A
+NAME="AEN1977"
+>12.4.8. Advanced Printing</A
 ></H2
 ><P
 >Note that you can do some pretty magic things by using your
@@ -1330,8 +1339,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2211"
->14.4.9. Real debugging</A
+NAME="AEN1980"
+>12.4.9. Real debugging</A
 ></H2
 ><P
 >If the above debug tips don't help, then maybe you need to bring in
@@ -1355,7 +1364,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="pam.html"
+HREF="groupmapping.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -1383,8 +1392,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Configuring PAM for distributed but centrally 
-managed authentication</TD
+>Configuring Group Mapping</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/rpcclient.1.html b/docs/htmldocs/rpcclient.1.html
index 6e71ddeb14..02c66ff7a4 100644
--- a/docs/htmldocs/rpcclient.1.html
+++ b/docs/htmldocs/rpcclient.1.html
@@ -99,36 +99,66 @@ CLASS="REFENTRYTITLE"
 >.</P
 ></DD
 ><DT
->-A|--authfile=filename</DT
+>-c|--command='command string'</DT
 ><DD
 ><P
->This option allows 
-		you to specify a file from which to read the username and 
-		password used in the connection.  The format of the file is 
-		</P
+>execute semicolon separated commands (listed 
+		below)) </P
+></DD
+><DT
+>-I IP-address</DT
+><DD
 ><P
-><PRE
-CLASS="PROGRAMLISTING"
->username = &#60;value&#62; 
-password = &#60;value&#62;
-domain   = &#60;value&#62;</PRE
-></P
+><VAR
+CLASS="REPLACEABLE"
+>IP address</VAR
+> is the address of the server to connect to. 
+		It should be specified in standard "a.b.c.d" notation. </P
 ><P
->Make certain that the permissions on the file restrict 
-		access from unwanted users. </P
+>Normally the client would attempt to locate a named 
+		SMB/CIFS server by looking it up via the NetBIOS name resolution 
+		mechanism described above in the <VAR
+CLASS="PARAMETER"
+>name resolve order</VAR
+> 
+		parameter above. Using this parameter will force the client
+		to assume that the server is on the machine with the specified IP 
+		address and the NetBIOS name component of the resource being 
+		connected to will be ignored. </P
+><P
+>There is no default for this parameter. If not supplied, 
+		it will be determined automatically by the client as described 
+		above. </P
 ></DD
 ><DT
->-c|--command='command string'</DT
+>-V</DT
 ><DD
 ><P
->execute semicolon separated commands (listed 
-		below)) </P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
 ></DD
 ><DT
->-h|--help</DT
+>-s &#60;configuration file&#62;</DT
 ><DD
 ><P
->Print a summary of command line options.</P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
 ></DD
 ><DT
 >-d|--debug=debuglevel</DT
@@ -170,69 +200,52 @@ CLASS="FILENAME"
 > file.</P
 ></DD
 ><DT
->-I IP-address</DT
+>-l|--logfile=logbasename</DT
 ><DD
 ><P
-><VAR
-CLASS="REPLACEABLE"
->IP address</VAR
-> is the address of the server to connect to. 
-		It should be specified in standard "a.b.c.d" notation. </P
-><P
->Normally the client would attempt to locate a named 
-		SMB/CIFS server by looking it up via the NetBIOS name resolution 
-		mechanism described above in the <VAR
-CLASS="PARAMETER"
->name resolve order</VAR
-> 
-		parameter above. Using this parameter will force the client
-		to assume that the server is on the machine with the specified IP 
-		address and the NetBIOS name component of the resource being 
-		connected to will be ignored. </P
-><P
->There is no default for this parameter. If not supplied, 
-		it will be determined automatically by the client as described 
-		above. </P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ><DT
->-l|--logfile=logbasename</DT
+>-N</DT
 ><DD
 ><P
->File name for log/debug files. The extension 
-		<CODE
-CLASS="CONSTANT"
->'.client'</CODE
-> will be appended. The log file is
-		never removed by the client.
-		</P
+>If specified, this parameter suppresses the normal
+password prompt from the client to the user. This is useful when
+accessing a service that does not require a password. </P
+><P
+>Unless a password is specified on the command line or
+this parameter is specified, the client will request a
+password.</P
 ></DD
 ><DT
->-N|--nopass</DT
+>-k</DT
 ><DD
 ><P
->instruct <B
-CLASS="COMMAND"
->rpcclient</B
-> not to ask 
-		for a password.   By default, <B
-CLASS="COMMAND"
->rpcclient</B
-> will
-		prompt for a password.  See also the <VAR
-CLASS="PARAMETER"
->-U</VAR
->
-		option.</P
+>Try to authenticate with kerberos. Only useful in
+an Active Directory environment.</P
 ></DD
 ><DT
->-s|--conf=smb.conf</DT
+>-A|--authfile=filename</DT
 ><DD
 ><P
->Specifies the location of the all-important 
-		<TT
-CLASS="FILENAME"
->smb.conf</TT
-> file. </P
+>This option allows
+you to specify a file from which to read the username and
+password used in the connection.  The format of the file is</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+>username = &#60;value&#62;
+password = &#60;value&#62;
+domain   = &#60;value&#62;</PRE
+></P
+><P
+>Make certain that the permissions on the file restrict 
+access from unwanted users. </P
 ></DD
 ><DT
 >-U|--user=username[%password]</DT
@@ -240,53 +253,125 @@ CLASS="FILENAME"
 ><P
 >Sets the SMB username or username and password. </P
 ><P
->If %password is not specified, the user will be prompted. The 
-		client will first check the <VAR
+>If %password is not specified, the user will be prompted. The
+client will first check the <VAR
 CLASS="ENVAR"
 >USER</VAR
-> environment variable, then the 
-		<VAR
+> environment variable, then the
+<VAR
 CLASS="ENVAR"
 >LOGNAME</VAR
-> variable and if either exists, the 
-		string is uppercased. If these environmental variables are not 
-		found, the username <CODE
+> variable and if either exists, the
+string is uppercased. If these environmental variables are not
+found, the username <CODE
 CLASS="CONSTANT"
 >GUEST</CODE
 > is used. </P
 ><P
->A third option is to use a credentials file which 
-		contains the plaintext of the username and password.  This 
-		option is mainly provided for scripts where the admin does not 
-		wish to pass the credentials on the command line or via environment 
-		variables. If this method is used, make certain that the permissions 
-		on the file restrict access from unwanted users.  See the 
-		<VAR
+>A third option is to use a credentials file which
+contains the plaintext of the username and password.  This
+option is mainly provided for scripts where the admin does not
+wish to pass the credentials on the command line or via environment
+variables. If this method is used, make certain that the permissions
+on the file restrict access from unwanted users.  See the
+<VAR
 CLASS="PARAMETER"
 >-A</VAR
 > for more details. </P
 ><P
->Be cautious about including passwords in scripts. Also, on 
-		many systems the command line of a running process may be seen 
-		via the <B
+>Be cautious about including passwords in scripts. Also, on
+many systems the command line of a running process may be seen
+via the <B
 CLASS="COMMAND"
 >ps</B
-> command.  To be safe always allow 
-		<B
+> command.  To be safe always allow
+<B
 CLASS="COMMAND"
 >rpcclient</B
-> to prompt for a password and type 
-		it in directly. </P
+> to prompt for a password and type
+it in directly. </P
+></DD
+><DT
+>-n &#60;primary NetBIOS name&#62;</DT
+><DD
+><P
+>This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the <A
+HREF="smb.conf.5.html#netbiosname"
+TARGET="_top"
+><VAR
+CLASS="PARAMETER"
+>NetBIOS
+name</VAR
+></A
+> parameter in the <SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+> file.  However, a command
+line setting will take precedence over settings in
+<SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+>.</P
+></DD
+><DT
+>-i &#60;scope&#62;</DT
+><DD
+><P
+>This specifies a NetBIOS scope that
+<B
+CLASS="COMMAND"
+>nmblookup</B
+> will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>very</I
+></SPAN
+> rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.</P
 ></DD
 ><DT
 >-W|--workgroup=domain</DT
 ><DD
 ><P
->Set the SMB domain of the username.   This 
-		overrides the default domain which is the domain defined in 
-		smb.conf.  If the domain specified is the same as the server's NetBIOS name, 
-		it causes the client to log on using the  server's local SAM (as 
-		opposed to the Domain SAM). </P
+>Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). </P
+></DD
+><DT
+>-O socket options</DT
+><DD
+><P
+>TCP socket options to set on the client
+socket. See the socket options parameter in
+the <SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+> manual page for the list of valid
+options. </P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
 ></DD
 ></DL
 ></DIV
@@ -294,54 +379,133 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN111"
+NAME="AEN144"
 ></A
 ><H2
 >COMMANDS</H2
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->LSARPC</I
-></SPAN
-></P
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN146"
+></A
+><H3
+>LSARPC</H3
 ><P
 ></P
-><UL
-><LI
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>lsaquery</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->lsaquery</B
-></P
-></LI
-><LI
+>Query info policy</P
+></DD
+><DT
+>lookupsids</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->lookupsids</B
-> - Resolve a list 
+>Resolve a list 
 		of SIDs to usernames.
 		</P
-></LI
-><LI
+></DD
+><DT
+>lookupnames</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->lookupnames</B
-> - Resolve a list 
+>Resolve a list 
 		of usernames to SIDs.
 		</P
-></LI
-><LI
+></DD
+><DT
+>enumtrusts</DT
+><DD
+><P
+>Enumerate trusted domains</P
+></DD
+><DT
+>enumprivs</DT
+><DD
+><P
+>Enumerate privileges</P
+></DD
+><DT
+>getdispname</DT
+><DD
+><P
+>Get the privilege name</P
+></DD
+><DT
+>lsaenumsid</DT
+><DD
+><P
+>Enumerate the LSA SIDS</P
+></DD
+><DT
+>lsaenumprivsaccount</DT
+><DD
+><P
+>Enumerate the privileges of an SID</P
+></DD
+><DT
+>lsaenumacctrights</DT
+><DD
+><P
+>Enumerate the rights of an SID</P
+></DD
+><DT
+>lsaenumacctwithright</DT
+><DD
+><P
+>Enumerate accounts with a right</P
+></DD
+><DT
+>lsaaddacctrights</DT
+><DD
+><P
+>Add rights to an account</P
+></DD
+><DT
+>lsaremoveacctrights</DT
+><DD
+><P
+>Remove rights from an account</P
+></DD
+><DT
+>lsalookupprivvalue</DT
+><DD
+><P
+>Get a privilege value given its name</P
+></DD
+><DT
+>lsaquerysecobj</DT
+><DD
+><P
+>Query LSA security object</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN205"
+></A
+><H3
+>LSARPC-DS</H3
 ><P
-><B
-CLASS="COMMAND"
->enumtrusts</B
 ></P
-></LI
-></UL
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>dsroledominfo</DT
+><DD
+><P
+>Get Primary Domain Information</P
+></DD
+></DL
+></DIV
 ><P
 > </P
 ><P
@@ -349,89 +513,241 @@ CLASS="COMMAND"
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
->SAMR</I
+>DFS</I
 ></SPAN
 ></P
 ><P
 ></P
-><UL
-><LI
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>dfsexist</DT
+><DD
+><P
+>Query DFS support</P
+></DD
+><DT
+>dfsadd</DT
+><DD
+><P
+>Add a DFS share</P
+></DD
+><DT
+>dfsremove</DT
+><DD
+><P
+>Remove a DFS share</P
+></DD
+><DT
+>dfsgetinfo</DT
+><DD
+><P
+>Query DFS share info</P
+></DD
+><DT
+>dfsenum</DT
+><DD
+><P
+>Enumerate dfs shares</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN236"
+></A
+><H3
+>REG</H3
 ><P
-><B
-CLASS="COMMAND"
->queryuser</B
 ></P
-></LI
-><LI
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>shutdown</DT
+><DD
+><P
+>Remote Shutdown</P
+></DD
+><DT
+>abortshutdown</DT
+><DD
+><P
+>Abort Shutdown</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN247"
+></A
+><H3
+>SRVSVC</H3
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>srvinfo</DT
+><DD
+><P
+>Server query info</P
+></DD
+><DT
+>netshareenum</DT
+><DD
+><P
+>Enumerate shares</P
+></DD
+><DT
+>netfileenum</DT
+><DD
+><P
+>Enumerate open files</P
+></DD
+><DT
+>netremotetod</DT
+><DD
+><P
+>Fetch remote time of day</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN266"
+></A
+><H3
+>SAMR</H3
 ><P
-><B
-CLASS="COMMAND"
->querygroup</B
 ></P
-></LI
-><LI
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>queryuser</DT
+><DD
+><P
+>Query user info</P
+></DD
+><DT
+>querygroup</DT
+><DD
+><P
+>Query group info</P
+></DD
+><DT
+>queryusergroups</DT
+><DD
+><P
+>Query user groups</P
+></DD
+><DT
+>querygroupmem</DT
+><DD
+><P
+>Query group membership</P
+></DD
+><DT
+>queryaliasmem</DT
+><DD
+><P
+>Query alias membership</P
+></DD
+><DT
+>querydispinfo</DT
+><DD
+><P
+>Query display info</P
+></DD
+><DT
+>querydominfo</DT
+><DD
+><P
+>Query domain info</P
+></DD
+><DT
+>enumdomusers</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->queryusergroups</B
-></P
-></LI
-><LI
+>Enumerate domain users</P
+></DD
+><DT
+>enumdomgroups</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->querygroupmem</B
-></P
-></LI
-><LI
+>Enumerate domain groups</P
+></DD
+><DT
+>enumalsgroups</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->queryaliasmem</B
-></P
-></LI
-><LI
+>Enumerate alias groups</P
+></DD
+><DT
+>createdomuser</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->querydispinfo</B
-></P
-></LI
-><LI
+>Create domain user</P
+></DD
+><DT
+>samlookupnames</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->querydominfo</B
-></P
-></LI
-><LI
+>Look up names</P
+></DD
+><DT
+>samlookuprids</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->enumdomgroups</B
-></P
-></LI
-></UL
+>Look up names</P
+></DD
+><DT
+>deletedomuser</DT
+><DD
 ><P
-> </P
+>Delete domain user</P
+></DD
+><DT
+>samquerysecobj</DT
+><DD
 ><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->SPOOLSS</I
-></SPAN
-></P
+>Query SAMR security object</P
+></DD
+><DT
+>getdompwinfo</DT
+><DD
+><P
+>Retrieve domain password info</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN333"
+></A
+><H3
+>SPOOLSS</H3
 ><P
 ></P
-><UL
-><LI
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>adddriver &#60;arch&#62; &#60;config&#62;</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->adddriver &#60;arch&#62; &#60;config&#62;</B
-> 
-		- Execute an AddPrinterDriver() RPC to install the printer driver 
+>		Execute an AddPrinterDriver() RPC to install the printer driver 
 		information on the server.  Note that the driver files should 
 		already exist in the directory returned by  
 		<B
@@ -472,15 +788,13 @@ Comma Separated list of Files</PRE
 		be "NULL".   On a remote NT print server, the Print Monitor for a 
 		driver must already be installed prior to adding the driver or 
 		else the RPC will fail. </P
-></LI
-><LI
-><P
-><B
-CLASS="COMMAND"
+></DD
+><DT
 >addprinter &#60;printername&#62; 
-		&#60;sharename&#62; &#60;drivername&#62; &#60;port&#62;</B
-> 
-		- Add a printer on the remote server.  This printer 
+		&#60;sharename&#62; &#60;drivername&#62; &#60;port&#62;</DT
+><DD
+><P
+>		Add a printer on the remote server.  This printer 
  		will be automatically shared.  Be aware that the printer driver 
 		must already be installed on the server (see <B
 CLASS="COMMAND"
@@ -494,105 +808,107 @@ CLASS="PARAMETER"
 CLASS="COMMAND"
 >enumports</B
 >.</P
-></LI
-><LI
+></DD
+><DT
+>deldriver</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->deldriver</B
-> - Delete the 
+>Delete the 
 		specified printer driver for all architectures.  This
 		does not delete the actual driver files from the server,
 		only the entry from the server's list of drivers.
 		</P
-></LI
-><LI
+></DD
+><DT
+>enumdata</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->enumdata</B
-> - Enumerate all 
+>Enumerate all 
 		printer setting data stored on the server. On Windows NT  clients, 
 		these values are stored  in the registry, while Samba servers 
 		store them in the printers TDB.  This command corresponds
 		to the MS Platform SDK GetPrinterData() function (* This
 		command is currently unimplemented).</P
-></LI
-><LI
+></DD
+><DT
+>enumdataex</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->enumjobs &#60;printer&#62;</B
-> 
-		- List the jobs and status of a given printer. 
+>Enumerate printer data for a key</P
+></DD
+><DT
+>enumjobs &#60;printer&#62;</DT
+><DD
+><P
+>List the jobs and status of a given printer. 
 		This command corresponds to the MS Platform SDK EnumJobs() 
-		function (* This command is currently unimplemented).</P
-></LI
-><LI
+		function </P
+></DD
+><DT
+>enumkey</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->enumports [level]</B
-> 
-		- Executes an EnumPorts() call using the specified 
+>Enumerate printer keys</P
+></DD
+><DT
+>enumports [level]</DT
+><DD
+><P
+>		Executes an EnumPorts() call using the specified 
 		info level. Currently only info levels 1 and 2 are supported. 
 		</P
-></LI
-><LI
+></DD
+><DT
+>enumdrivers [level]</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->enumdrivers [level]</B
-> 
-		- Execute an EnumPrinterDrivers() call.  This lists the various installed 
+>		Execute an EnumPrinterDrivers() call.  This lists the various installed 
 		printer drivers for all architectures.  Refer to the MS Platform SDK 
 		documentation for more details of the various flags and calling 
 		options. Currently supported info levels are 1, 2, and 3.</P
-></LI
-><LI
+></DD
+><DT
+>enumprinters [level]</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->enumprinters [level]</B
-> 
-		- Execute an EnumPrinters() call.  This lists the various installed 
+>Execute an EnumPrinters() call.  This lists the various installed 
 		and share printers.  Refer to the MS Platform SDK documentation for 
 		more details of the various flags and calling options. Currently
 		supported info levels are 0, 1, and 2.</P
-></LI
-><LI
+></DD
+><DT
+>getdata &#60;printername&#62; &#60;valuename;&#62;</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->getdata &#60;printername&#62;</B
-> 
-		- Retrieve the data for a given printer setting.  See 
+>Retrieve the data for a given printer setting.  See 
 		the  <B
 CLASS="COMMAND"
 >enumdata</B
 > command for more information.  
 		This command corresponds to the GetPrinterData() MS Platform 
-		SDK function (* This command is currently unimplemented). </P
-></LI
-><LI
+		SDK function. </P
+></DD
+><DT
+>getdataex</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->getdriver &#60;printername&#62;</B
-> 
-		- Retrieve the printer driver information (such as driver file, 
+>Get printer driver data with keyname</P
+></DD
+><DT
+>getdriver &#60;printername&#62;</DT
+><DD
+><P
+>		Retrieve the printer driver information (such as driver file, 
 		config file, dependent files, etc...) for 
 		the given printer. This command corresponds to the GetPrinterDriver()
 		MS Platform  SDK function. Currently info level 1, 2, and 3 are supported.
 		</P
-></LI
-><LI
+></DD
+><DT
+>getdriverdir &#60;arch&#62;</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->getdriverdir &#60;arch&#62;</B
-> 
-		- Execute a GetPrinterDriverDirectory()
+>		Execute a GetPrinterDriverDirectory()
 		RPC to retrieve the SMB share name and subdirectory for 
 		storing printer driver files for a given architecture.  Possible 
 		values for <VAR
@@ -601,34 +917,34 @@ CLASS="PARAMETER"
 > are "Windows 4.0" 
 		(for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows
 		Alpha_AXP", and "Windows NT R4000". </P
-></LI
-><LI
+></DD
+><DT
+>getprinter &#60;printername&#62;</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->getprinter &#60;printername&#62;</B
-> 
-		- Retrieve the current printer information.  This command 
+>Retrieve the current printer information.  This command 
 		corresponds to the GetPrinter() MS Platform SDK function. 
 		</P
-></LI
-><LI
+></DD
+><DT
+>getprintprocdir</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->openprinter &#60;printername&#62;</B
-> 
-		- Execute an OpenPrinterEx() and ClosePrinter() RPC 
-		against a given printer. </P
-></LI
-><LI
+>Get print processor directory</P
+></DD
+><DT
+>openprinter &#60;printername&#62;</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
+>Execute an OpenPrinterEx() and ClosePrinter() RPC 
+		against a given printer. </P
+></DD
+><DT
 >setdriver &#60;printername&#62;
-		&#60;drivername&#62;</B
->
-		- Execute a SetPrinter() command to update the printer driver
+		&#60;drivername&#62;</DT
+><DD
+><P
+>Execute a SetPrinter() command to update the printer driver
 		associated with an installed printer.  The printer driver must
 		already be correctly installed on the print server.  </P
 ><P
@@ -641,53 +957,148 @@ CLASS="COMMAND"
 >enumdrivers</B
 > commands for obtaining a list of
 		of installed printers and drivers.</P
-></LI
-></UL
+></DD
+><DT
+>addform</DT
+><DD
+><P
+>Add form</P
+></DD
+><DT
+>setform</DT
+><DD
+><P
+>Set form</P
+></DD
+><DT
+>getform</DT
+><DD
+><P
+>Get form</P
+></DD
+><DT
+>deleteform</DT
+><DD
+><P
+>Delete form</P
+></DD
+><DT
+>enumforms</DT
+><DD
+><P
+>Enumerate form</P
+></DD
+><DT
+>setprinter</DT
+><DD
+><P
+>Set printer comment</P
+></DD
+><DT
+>setprinterdata</DT
+><DD
+><P
+>Set REG_SZ printer data</P
+></DD
+><DT
+>rffpcnex</DT
+><DD
+><P
+>Rffpcnex test</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN456"
+></A
+><H3
+>NETLOGON</H3
 ><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->GENERAL OPTIONS</I
-></SPAN
 ></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>logonctrl2</DT
+><DD
+><P
+>Logon Control 2</P
+></DD
+><DT
+>logonctrl</DT
+><DD
+><P
+>Logon Control</P
+></DD
+><DT
+>samsync</DT
+><DD
+><P
+>Sam Synchronisation</P
+></DD
+><DT
+>samdeltas</DT
+><DD
+><P
+>Query Sam Deltas</P
+></DD
+><DT
+>samlogon</DT
+><DD
+><P
+>Sam Logon</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN479"
+></A
+><H3
+>GENERAL COMMANDS</H3
 ><P
 ></P
-><UL
-><LI
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>debuglevel</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->debuglevel</B
-> - Set the current
+>Set the current
 		debug level used to log information.</P
-></LI
-><LI
+></DD
+><DT
+>help (?)</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->help (?)</B
-> - Print a listing of all 
+>Print a listing of all 
 		known commands or extended help  on a particular command. 
 		</P
-></LI
-><LI
+></DD
+><DT
+>quit (exit)</DT
+><DD
 ><P
-><B
-CLASS="COMMAND"
->quit (exit)</B
-> - Exit <B
+>Exit <B
 CLASS="COMMAND"
 >rpcclient
 		</B
 >.</P
-></LI
-></UL
+></DD
+></DL
+></DIV
+></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN231"
+NAME="AEN495"
 ></A
 ><H2
 >BUGS</H2
@@ -737,7 +1148,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN245"
+NAME="AEN509"
 ></A
 ><H2
 >VERSION</H2
@@ -748,7 +1159,7 @@ NAME="AEN245"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN248"
+NAME="AEN512"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/samba-bdc.html b/docs/htmldocs/samba-bdc.html
index 4ae64563aa..2a27c4ad82 100644
--- a/docs/htmldocs/samba-bdc.html
+++ b/docs/htmldocs/samba-bdc.html
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1193"
+NAME="AEN1267"
 >7.1. Prerequisite Reading</A
 ></H1
 ><P
@@ -97,7 +97,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1197"
+NAME="AEN1271"
 >7.2. Background</A
 ></H1
 ><P
@@ -142,7 +142,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1205"
+NAME="AEN1279"
 >7.3. What qualifies a Domain Controller on the network?</A
 ></H1
 ><P
@@ -159,7 +159,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1208"
+NAME="AEN1282"
 >7.3.1. How does a Workstation find its domain controller?</A
 ></H2
 ><P
@@ -178,7 +178,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1211"
+NAME="AEN1285"
 >7.3.2. When is the PDC needed?</A
 ></H2
 ><P
@@ -194,7 +194,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1214"
+NAME="AEN1288"
 >7.4. Can Samba be a Backup Domain Controller to an NT PDC?</A
 ></H1
 ><P
@@ -217,7 +217,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1219"
+NAME="AEN1293"
 >7.5. How do I set up a Samba BDC?</A
 ></H1
 ><P
@@ -284,7 +284,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1236"
+NAME="AEN1310"
 >7.5.1. How do I replicate the smbpasswd file?</A
 ></H2
 ><P
@@ -305,7 +305,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1240"
+NAME="AEN1314"
 >7.5.2. Can I do this all with LDAP?</A
 ></H2
 ><P
diff --git a/docs/htmldocs/samba-howto-collection.html b/docs/htmldocs/samba-howto-collection.html
index 98f8bcfbc8..3d666c9a0e 100644
--- a/docs/htmldocs/samba-howto-collection.html
+++ b/docs/htmldocs/samba-howto-collection.html
@@ -35,20 +35,41 @@ CLASS="AUTHOR"
 NAME="AEN4"
 ></A
 >SAMBA Team</H3
-><HR></DIV
-><H1
+><DIV
+CLASS="AFFILIATION"
+><DIV
+CLASS="ADDRESS"
+><P
+CLASS="ADDRESS"
+><CODE
+CLASS="EMAIL"
+>&#60;<A
+HREF="mailto:samba@samba.org"
+>samba@samba.org</A
+>&#62;</CODE
+></P
+></DIV
+></DIV
+><H4
+CLASS="EDITEDBY"
+>Edited by</H4
+><H3
+CLASS="EDITOR"
+>John H Terpstra</H3
+><H3
+CLASS="EDITOR"
+>Jelmer Vernooij</H3
+><H3
+CLASS="EDITOR"
+>Gerald (Jerry) Carter</H3
+><DIV
+><DIV
+CLASS="ABSTRACT"
+><P
+></P
 ><A
-NAME="AEN8"
+NAME="AEN32"
 ></A
->Abstract</H1
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Last Update</I
-></SPAN
-> : Wed Jan 15</P
 ><P
 >This book is a collection of HOWTOs added to Samba documentation over the years.
 I try to ensure that all are current, but sometimes the is a larger job
@@ -69,6 +90,17 @@ TARGET="_top"
 >jelmer@samba.org</A
 >.</P
 ><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="LEGALNOTICE"
+><P
+></P
+><A
+NAME="AEN37"
+></A
+><P
 >This documentation is distributed under the GNU General Public License (GPL) 
 version 2.  A copy of the license is included with the Samba source
 distribution.  A copy can be found on-line at <A
@@ -77,7 +109,9 @@ TARGET="_top"
 >http://www.fsf.org/licenses/gpl.txt</A
 ></P
 ><P
->Cheers, jerry</P
+></P
+></DIV
+><HR></DIV
 ><DIV
 CLASS="TOC"
 ><DL
@@ -101,34 +135,34 @@ HREF="install.html"
 ><DL
 ><DT
 >1.1. <A
-HREF="install.html#AEN26"
+HREF="install.html#AEN65"
 >Obtaining and installing samba</A
 ></DT
 ><DT
 >1.2. <A
-HREF="install.html#AEN31"
+HREF="install.html#AEN70"
 >Configuring samba</A
 ></DT
 ><DT
 >1.3. <A
-HREF="install.html#AEN64"
+HREF="install.html#AEN103"
 >Try listing the shares available on your 
 	server</A
 ></DT
 ><DT
 >1.4. <A
-HREF="install.html#AEN73"
+HREF="install.html#AEN112"
 >Try connecting with the unix client</A
 ></DT
 ><DT
 >1.5. <A
-HREF="install.html#AEN89"
+HREF="install.html#AEN128"
 >Try connecting from a DOS, WfWg, Win9x, WinNT, 
 	Win2k, OS/2, etc... client</A
 ></DT
 ><DT
 >1.6. <A
-HREF="install.html#AEN103"
+HREF="install.html#AEN142"
 >What If Things Don't Work?</A
 ></DT
 ></DL
@@ -142,38 +176,44 @@ HREF="browsing-quick.html"
 ><DL
 ><DT
 >2.1. <A
-HREF="browsing-quick.html#AEN130"
+HREF="browsing-quick.html#AEN174"
 >Discussion</A
 ></DT
 ><DT
 >2.2. <A
-HREF="browsing-quick.html#AEN139"
+HREF="browsing-quick.html#AEN193"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></DT
 ><DT
 >2.3. <A
-HREF="browsing-quick.html#AEN149"
->Use of the "Remote Announce" parameter</A
+HREF="browsing-quick.html#AEN207"
+>Use of the <B
+CLASS="COMMAND"
+>Remote Announce</B
+> parameter</A
 ></DT
 ><DT
 >2.4. <A
-HREF="browsing-quick.html#AEN163"
->Use of the "Remote Browse Sync" parameter</A
+HREF="browsing-quick.html#AEN230"
+>Use of the <B
+CLASS="COMMAND"
+>Remote Browse Sync</B
+> parameter</A
 ></DT
 ><DT
 >2.5. <A
-HREF="browsing-quick.html#AEN168"
+HREF="browsing-quick.html#AEN241"
 >Use of WINS</A
 ></DT
 ><DT
 >2.6. <A
-HREF="browsing-quick.html#AEN179"
+HREF="browsing-quick.html#AEN255"
 >Do NOT use more than one (1) protocol on MS Windows machines</A
 ></DT
 ><DT
 >2.7. <A
-HREF="browsing-quick.html#AEN187"
+HREF="browsing-quick.html#AEN263"
 >Name Resolution Order</A
 ></DT
 ></DL
@@ -187,43 +227,43 @@ HREF="passdb.html"
 ><DL
 ><DT
 >3.1. <A
-HREF="passdb.html#AEN244"
+HREF="passdb.html#AEN321"
 >Introduction</A
 ></DT
 ><DT
 >3.2. <A
-HREF="passdb.html#AEN251"
+HREF="passdb.html#AEN328"
 >Important Notes About Security</A
 ></DT
 ><DT
 >3.3. <A
-HREF="passdb.html#AEN289"
+HREF="passdb.html#AEN366"
 >The smbpasswd Command</A
 ></DT
 ><DT
 >3.4. <A
-HREF="passdb.html#AEN320"
+HREF="passdb.html#AEN397"
 >Plain text</A
 ></DT
 ><DT
 >3.5. <A
-HREF="passdb.html#AEN325"
+HREF="passdb.html#AEN402"
 >TDB</A
 ></DT
 ><DT
 >3.6. <A
-HREF="passdb.html#AEN328"
+HREF="passdb.html#AEN405"
 >LDAP</A
 ></DT
 ><DT
 >3.7. <A
-HREF="passdb.html#AEN546"
+HREF="passdb.html#AEN623"
 >MySQL</A
 ></DT
 ><DT
 >3.8. <A
-HREF="passdb.html#AEN594"
->Passdb XML plugin</A
+HREF="passdb.html#AEN665"
+>XML</A
 ></DT
 ></DL
 ></DD
@@ -245,17 +285,17 @@ HREF="servertype.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="servertype.html#AEN639"
+HREF="servertype.html#AEN703"
 >Stand Alone Server</A
 ></DT
 ><DT
 >4.2. <A
-HREF="servertype.html#AEN646"
+HREF="servertype.html#AEN710"
 >Domain Member Server</A
 ></DT
 ><DT
 >4.3. <A
-HREF="servertype.html#AEN652"
+HREF="servertype.html#AEN716"
 >Domain Controller</A
 ></DT
 ></DL
@@ -269,7 +309,7 @@ HREF="securitylevels.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="securitylevels.html#AEN681"
+HREF="securitylevels.html#AEN752"
 >User and Share security level</A
 ></DT
 ></DL
@@ -283,37 +323,37 @@ HREF="samba-pdc.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="samba-pdc.html#AEN785"
+HREF="samba-pdc.html#AEN859"
 >Prerequisite Reading</A
 ></DT
 ><DT
 >6.2. <A
-HREF="samba-pdc.html#AEN790"
+HREF="samba-pdc.html#AEN864"
 >Background</A
 ></DT
 ><DT
 >6.3. <A
-HREF="samba-pdc.html#AEN830"
+HREF="samba-pdc.html#AEN904"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
 >6.4. <A
-HREF="samba-pdc.html#AEN872"
+HREF="samba-pdc.html#AEN946"
 >Creating Machine Trust Accounts and Joining Clients to the Domain</A
 ></DT
 ><DT
 >6.5. <A
-HREF="samba-pdc.html#AEN980"
+HREF="samba-pdc.html#AEN1054"
 >Common Problems and Errors</A
 ></DT
 ><DT
 >6.6. <A
-HREF="samba-pdc.html#AEN1026"
+HREF="samba-pdc.html#AEN1100"
 >What other help can I get?</A
 ></DT
 ><DT
 >6.7. <A
-HREF="samba-pdc.html#AEN1140"
+HREF="samba-pdc.html#AEN1214"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ></DL
@@ -327,27 +367,27 @@ HREF="samba-bdc.html"
 ><DL
 ><DT
 >7.1. <A
-HREF="samba-bdc.html#AEN1193"
+HREF="samba-bdc.html#AEN1267"
 >Prerequisite Reading</A
 ></DT
 ><DT
 >7.2. <A
-HREF="samba-bdc.html#AEN1197"
+HREF="samba-bdc.html#AEN1271"
 >Background</A
 ></DT
 ><DT
 >7.3. <A
-HREF="samba-bdc.html#AEN1205"
+HREF="samba-bdc.html#AEN1279"
 >What qualifies a Domain Controller on the network?</A
 ></DT
 ><DT
 >7.4. <A
-HREF="samba-bdc.html#AEN1214"
+HREF="samba-bdc.html#AEN1288"
 >Can Samba be a Backup Domain Controller to an NT PDC?</A
 ></DT
 ><DT
 >7.5. <A
-HREF="samba-bdc.html#AEN1219"
+HREF="samba-bdc.html#AEN1293"
 >How do I set up a Samba BDC?</A
 ></DT
 ></DL
@@ -361,7 +401,7 @@ HREF="ads.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="ads.html#AEN1251"
+HREF="ads.html#AEN1336"
 >Setup your <TT
 CLASS="FILENAME"
 >smb.conf</TT
@@ -369,7 +409,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >8.2. <A
-HREF="ads.html#AEN1262"
+HREF="ads.html#AEN1349"
 >Setup your <TT
 CLASS="FILENAME"
 >/etc/krb5.conf</TT
@@ -377,22 +417,22 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >8.3. <A
-HREF="ads.html#AEN1273"
+HREF="ads.html#ADS-CREATE-MACHINE-ACCOUNT"
 >Create the computer account</A
 ></DT
 ><DT
 >8.4. <A
-HREF="ads.html#AEN1285"
+HREF="ads.html#ADS-TEST-SERVER"
 >Test your server setup</A
 ></DT
 ><DT
 >8.5. <A
-HREF="ads.html#AEN1290"
+HREF="ads.html#ADS-TEST-SMBCLIENT"
 >Testing with smbclient</A
 ></DT
 ><DT
 >8.6. <A
-HREF="ads.html#AEN1293"
+HREF="ads.html#AEN1390"
 >Notes</A
 ></DT
 ></DL
@@ -406,12 +446,12 @@ HREF="domain-security.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="domain-security.html#AEN1315"
+HREF="domain-security.html#AEN1413"
 >Joining an NT Domain with Samba 3.0</A
 ></DT
 ><DT
 >9.2. <A
-HREF="domain-security.html#AEN1369"
+HREF="domain-security.html#AEN1467"
 >Why is this better than security = server?</A
 ></DT
 ></DL
@@ -427,392 +467,473 @@ HREF="optional.html"
 ><DL
 ><DT
 >10. <A
-HREF="advancednetworkmanagement.html"
->System Policies</A
-></DT
-><DD
-><DL
-><DT
->10.1. <A
-HREF="advancednetworkmanagement.html#AEN1401"
->Basic System Policy Info</A
-></DT
-><DT
->10.2. <A
-HREF="advancednetworkmanagement.html#AEN1456"
->Roaming Profiles</A
-></DT
-></DL
-></DD
-><DT
->11. <A
 HREF="unix-permissions.html"
 >UNIX Permission Bits and Windows NT Access Control Lists</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="unix-permissions.html#AEN1663"
+>10.1. <A
+HREF="unix-permissions.html#AEN1499"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
->11.2. <A
-HREF="unix-permissions.html#AEN1667"
+>10.2. <A
+HREF="unix-permissions.html#AEN1505"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
->11.3. <A
-HREF="unix-permissions.html#AEN1678"
+>10.3. <A
+HREF="unix-permissions.html#AEN1516"
 >Viewing file ownership</A
 ></DT
 ><DT
->11.4. <A
-HREF="unix-permissions.html#AEN1698"
+>10.4. <A
+HREF="unix-permissions.html#AEN1536"
 >Viewing file or directory permissions</A
 ></DT
 ><DT
->11.5. <A
-HREF="unix-permissions.html#AEN1734"
+>10.5. <A
+HREF="unix-permissions.html#AEN1572"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
->11.6. <A
-HREF="unix-permissions.html#AEN1756"
+>10.6. <A
+HREF="unix-permissions.html#AEN1594"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
->11.7. <A
-HREF="unix-permissions.html#AEN1810"
+>10.7. <A
+HREF="unix-permissions.html#AEN1648"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
 ></DL
 ></DD
 ><DT
->12. <A
+>11. <A
 HREF="groupmapping.html"
->Group mapping HOWTO</A
-></DT
-><DT
->13. <A
-HREF="pam.html"
->Configuring PAM for distributed but centrally 
-managed authentication</A
+>Configuring Group Mapping</A
 ></DT
-><DD
-><DL
 ><DT
->13.1. <A
-HREF="pam.html#AEN1866"
->Samba and PAM</A
-></DT
-><DT
->13.2. <A
-HREF="pam.html#AEN1915"
->Distributed Authentication</A
-></DT
-><DT
->13.3. <A
-HREF="pam.html#AEN1920"
->PAM Configuration in smb.conf</A
-></DT
-></DL
-></DD
-><DT
->14. <A
+>12. <A
 HREF="printing.html"
 >Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.1. <A
-HREF="printing.html#AEN1946"
+>12.1. <A
+HREF="printing.html#AEN1711"
 >Introduction</A
 ></DT
 ><DT
->14.2. <A
-HREF="printing.html#AEN1968"
+>12.2. <A
+HREF="printing.html#AEN1733"
 >Configuration</A
 ></DT
 ><DT
->14.3. <A
-HREF="printing.html#AEN2076"
+>12.3. <A
+HREF="printing.html#AEN1845"
 >The Imprints Toolset</A
 ></DT
 ><DT
->14.4. <A
-HREF="printing.html#AEN2119"
+>12.4. <A
+HREF="printing.html#AEN1888"
 >Diagnosis</A
 ></DT
 ></DL
 ></DD
 ><DT
->15. <A
+>13. <A
 HREF="cups-printing.html"
 >CUPS Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.1. <A
-HREF="cups-printing.html#AEN2231"
+>13.1. <A
+HREF="cups-printing.html#AEN2000"
 >Introduction</A
 ></DT
 ><DT
->15.2. <A
-HREF="cups-printing.html#AEN2236"
->CUPS - RAW Print Through  Mode</A
+>13.2. <A
+HREF="cups-printing.html#AEN2007"
+>Configuring <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> for CUPS</A
 ></DT
 ><DT
->15.3. <A
-HREF="cups-printing.html#AEN2291"
+>13.3. <A
+HREF="cups-printing.html#AEN2026"
+>CUPS - RAW Print Through Mode</A
+></DT
+><DT
+>13.4. <A
+HREF="cups-printing.html#AEN2083"
+>CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe
+PostScript driver with CUPS-PPDs downloaded to clients</A
+></DT
+><DT
+>13.5. <A
+HREF="cups-printing.html#AEN2104"
+>Windows Terminal Servers (WTS) as CUPS clients</A
+></DT
+><DT
+>13.6. <A
+HREF="cups-printing.html#AEN2108"
+>Setting up CUPS for driver download</A
+></DT
+><DT
+>13.7. <A
+HREF="cups-printing.html#AEN2120"
+>Sources of CUPS drivers / PPDs</A
+></DT
+><DT
+>13.8. <A
+HREF="cups-printing.html#AEN2176"
 >The CUPS Filter Chains</A
 ></DT
 ><DT
->15.4. <A
-HREF="cups-printing.html#AEN2330"
+>13.9. <A
+HREF="cups-printing.html#AEN2215"
 >CUPS Print Drivers and Devices</A
 ></DT
 ><DT
->15.5. <A
-HREF="cups-printing.html#AEN2407"
+>13.10. <A
+HREF="cups-printing.html#AEN2292"
 >Limiting the number of pages users can print</A
 ></DT
 ><DT
->15.6. <A
-HREF="cups-printing.html#AEN2496"
+>13.11. <A
+HREF="cups-printing.html#AEN2388"
 >Advanced Postscript Printing from MS Windows</A
 ></DT
 ><DT
->15.7. <A
-HREF="cups-printing.html#AEN2511"
+>13.12. <A
+HREF="cups-printing.html#AEN2403"
 >Auto-Deletion of CUPS spool files</A
 ></DT
 ></DL
 ></DD
 ><DT
->16. <A
+>14. <A
 HREF="winbind.html"
 >Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.1. <A
-HREF="winbind.html#AEN2573"
+>14.1. <A
+HREF="winbind.html#AEN2469"
 >Abstract</A
 ></DT
 ><DT
->16.2. <A
-HREF="winbind.html#AEN2577"
+>14.2. <A
+HREF="winbind.html#AEN2473"
 >Introduction</A
 ></DT
 ><DT
->16.3. <A
-HREF="winbind.html#AEN2590"
+>14.3. <A
+HREF="winbind.html#AEN2486"
 >What Winbind Provides</A
 ></DT
 ><DT
->16.4. <A
-HREF="winbind.html#AEN2601"
+>14.4. <A
+HREF="winbind.html#AEN2497"
 >How Winbind Works</A
 ></DT
 ><DT
->16.5. <A
-HREF="winbind.html#AEN2644"
+>14.5. <A
+HREF="winbind.html#AEN2540"
 >Installation and Configuration</A
 ></DT
 ><DT
->16.6. <A
-HREF="winbind.html#AEN2901"
+>14.6. <A
+HREF="winbind.html#AEN2797"
 >Limitations</A
 ></DT
 ><DT
->16.7. <A
-HREF="winbind.html#AEN2911"
+>14.7. <A
+HREF="winbind.html#AEN2807"
 >Conclusion</A
 ></DT
 ></DL
 ></DD
 ><DT
->17. <A
-HREF="integrate-ms-networks.html"
->Integrating MS Windows networks with Samba</A
+>15. <A
+HREF="advancednetworkmanagement.html"
+>Advanced Network Manangement</A
 ></DT
 ><DD
 ><DL
 ><DT
->17.1. <A
-HREF="integrate-ms-networks.html#AEN2932"
->Name Resolution in a pure Unix/Linux world</A
+>15.1. <A
+HREF="advancednetworkmanagement.html#AEN2822"
+>Configuring Samba Share Access Controls</A
 ></DT
 ><DT
->17.2. <A
-HREF="integrate-ms-networks.html#AEN2995"
->Name resolution as used within MS Windows networking</A
+>15.2. <A
+HREF="advancednetworkmanagement.html#AEN2860"
+>Remote Server Administration</A
+></DT
+><DT
+>15.3. <A
+HREF="advancednetworkmanagement.html#AEN2877"
+>Network Logon Script Magic</A
 ></DT
 ></DL
 ></DD
 ><DT
->18. <A
-HREF="improved-browsing.html"
->Improved browsing in samba</A
+>16. <A
+HREF="policymgmt.html"
+>System and Account Policies</A
 ></DT
 ><DD
 ><DL
 ><DT
->18.1. <A
-HREF="improved-browsing.html#AEN3047"
->Overview of browsing</A
+>16.1. <A
+HREF="policymgmt.html#AEN2892"
+>Creating and Managing System Policies</A
 ></DT
 ><DT
->18.2. <A
-HREF="improved-browsing.html#AEN3052"
->Browsing support in samba</A
+>16.2. <A
+HREF="policymgmt.html#AEN2965"
+>Managing Account/User Policies</A
 ></DT
+></DL
+></DD
 ><DT
->18.3. <A
-HREF="improved-browsing.html#AEN3060"
->Problem resolution</A
+>17. <A
+HREF="profilemgmt.html"
+>Desktop Profile Management</A
 ></DT
+><DD
+><DL
 ><DT
->18.4. <A
-HREF="improved-browsing.html#AEN3069"
->Browsing across subnets</A
+>17.1. <A
+HREF="profilemgmt.html#AEN2998"
+>Roaming Profiles</A
 ></DT
 ><DT
->18.5. <A
-HREF="improved-browsing.html#AEN3109"
->Setting up a WINS server</A
+>17.2. <A
+HREF="profilemgmt.html#AEN3196"
+>Mandatory profiles</A
 ></DT
 ><DT
->18.6. <A
-HREF="improved-browsing.html#AEN3128"
->Setting up Browsing in a WORKGROUP</A
+>17.3. <A
+HREF="profilemgmt.html#AEN3203"
+>Creating/Managing Group Profiles</A
 ></DT
 ><DT
->18.7. <A
-HREF="improved-browsing.html#AEN3146"
->Setting up Browsing in a DOMAIN</A
+>17.4. <A
+HREF="profilemgmt.html#AEN3209"
+>Default Profile for Windows Users</A
 ></DT
+></DL
+></DD
 ><DT
->18.8. <A
-HREF="improved-browsing.html#AEN3156"
->Forcing samba to be the master</A
+>18. <A
+HREF="pam.html"
+>PAM Configuration for Centrally Managed Authentication</A
 ></DT
+><DD
+><DL
 ><DT
->18.9. <A
-HREF="improved-browsing.html#AEN3165"
->Making samba the domain master</A
+>18.1. <A
+HREF="pam.html#AEN3332"
+>Samba and PAM</A
 ></DT
 ><DT
->18.10. <A
-HREF="improved-browsing.html#AEN3183"
->Note about broadcast addresses</A
+>18.2. <A
+HREF="pam.html#AEN3383"
+>Distributed Authentication</A
 ></DT
 ><DT
->18.11. <A
-HREF="improved-browsing.html#AEN3186"
->Multiple interfaces</A
+>18.3. <A
+HREF="pam.html#AEN3388"
+>PAM Configuration in smb.conf</A
 ></DT
 ></DL
 ></DD
 ><DT
 >19. <A
-HREF="msdfs.html"
->Hosting a Microsoft Distributed File System tree on Samba</A
+HREF="vfs.html"
+>Stackable VFS modules</A
 ></DT
 ><DD
 ><DL
 ><DT
 >19.1. <A
-HREF="msdfs.html#AEN3200"
->Instructions</A
+HREF="vfs.html#AEN3423"
+>Introduction and configuration</A
+></DT
+><DT
+>19.2. <A
+HREF="vfs.html#AEN3432"
+>Included modules</A
+></DT
+><DT
+>19.3. <A
+HREF="vfs.html#AEN3490"
+>VFS modules available elsewhere</A
 ></DT
 ></DL
 ></DD
 ><DT
 >20. <A
-HREF="vfs.html"
->Stackable VFS modules</A
+HREF="msdfs.html"
+>Hosting a Microsoft Distributed File System tree on Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
 >20.1. <A
-HREF="vfs.html#AEN3259"
->Introduction and configuration</A
+HREF="msdfs.html#AEN3518"
+>Instructions</A
+></DT
+></DL
+></DD
+><DT
+>21. <A
+HREF="integrate-ms-networks.html"
+>Integrating MS Windows networks with Samba</A
 ></DT
+><DD
+><DL
 ><DT
->20.2. <A
-HREF="vfs.html#AEN3268"
->Included modules</A
+>21.1. <A
+HREF="integrate-ms-networks.html#AEN3580"
+>Name Resolution in a pure Unix/Linux world</A
 ></DT
 ><DT
->20.3. <A
-HREF="vfs.html#AEN3322"
->VFS modules available elsewhere</A
+>21.2. <A
+HREF="integrate-ms-networks.html#AEN3643"
+>Name resolution as used within MS Windows networking</A
 ></DT
 ></DL
 ></DD
 ><DT
->21. <A
+>22. <A
+HREF="improved-browsing.html"
+>Improved browsing in samba</A
+></DT
+><DD
+><DL
+><DT
+>22.1. <A
+HREF="improved-browsing.html#AEN3695"
+>Overview of browsing</A
+></DT
+><DT
+>22.2. <A
+HREF="improved-browsing.html#AEN3701"
+>Browsing support in samba</A
+></DT
+><DT
+>22.3. <A
+HREF="improved-browsing.html#AEN3714"
+>Problem resolution</A
+></DT
+><DT
+>22.4. <A
+HREF="improved-browsing.html#AEN3725"
+>Browsing across subnets</A
+></DT
+><DT
+>22.5. <A
+HREF="improved-browsing.html#AEN3765"
+>Setting up a WINS server</A
+></DT
+><DT
+>22.6. <A
+HREF="improved-browsing.html#AEN3785"
+>Setting up Browsing in a WORKGROUP</A
+></DT
+><DT
+>22.7. <A
+HREF="improved-browsing.html#AEN3808"
+>Setting up Browsing in a DOMAIN</A
+></DT
+><DT
+>22.8. <A
+HREF="improved-browsing.html#BROWSE-FORCE-MASTER"
+>Forcing samba to be the master</A
+></DT
+><DT
+>22.9. <A
+HREF="improved-browsing.html#AEN3843"
+>Making samba the domain master</A
+></DT
+><DT
+>22.10. <A
+HREF="improved-browsing.html#AEN3865"
+>Note about broadcast addresses</A
+></DT
+><DT
+>22.11. <A
+HREF="improved-browsing.html#AEN3868"
+>Multiple interfaces</A
+></DT
+></DL
+></DD
+><DT
+>23. <A
 HREF="securing-samba.html"
 >Securing Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->21.1. <A
-HREF="securing-samba.html#AEN3348"
+>23.1. <A
+HREF="securing-samba.html#AEN3884"
 >Introduction</A
 ></DT
 ><DT
->21.2. <A
-HREF="securing-samba.html#AEN3351"
+>23.2. <A
+HREF="securing-samba.html#AEN3887"
 >Using host based protection</A
 ></DT
 ><DT
->21.3. <A
-HREF="securing-samba.html#AEN3358"
+>23.3. <A
+HREF="securing-samba.html#AEN3894"
 >Using interface protection</A
 ></DT
 ><DT
->21.4. <A
-HREF="securing-samba.html#AEN3367"
+>23.4. <A
+HREF="securing-samba.html#AEN3903"
 >Using a firewall</A
 ></DT
 ><DT
->21.5. <A
-HREF="securing-samba.html#AEN3374"
+>23.5. <A
+HREF="securing-samba.html#AEN3910"
 >Using a IPC$ share deny</A
 ></DT
 ><DT
->21.6. <A
-HREF="securing-samba.html#AEN3383"
+>23.6. <A
+HREF="securing-samba.html#AEN3919"
 >Upgrading Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->22. <A
+>24. <A
 HREF="unicode.html"
 >Unicode/Charsets</A
 ></DT
 ><DD
 ><DL
 ><DT
->22.1. <A
-HREF="unicode.html#AEN3397"
+>24.1. <A
+HREF="unicode.html#AEN3933"
 >What are charsets and unicode?</A
 ></DT
 ><DT
->22.2. <A
-HREF="unicode.html#AEN3406"
+>24.2. <A
+HREF="unicode.html#AEN3942"
 >Samba and charsets</A
 ></DT
 ></DL
@@ -827,225 +948,263 @@ HREF="appendixes.html"
 ><DD
 ><DL
 ><DT
->23. <A
+>25. <A
+HREF="swat.html"
+>SWAT - The Samba Web Admininistration Tool</A
+></DT
+><DD
+><DL
+><DT
+>25.1. <A
+HREF="swat.html#AEN3976"
+>SWAT Features and Benefits</A
+></DT
+></DL
+></DD
+><DT
+>26. <A
+HREF="nt4migration.html"
+>Migration from NT4 PDC to Samba-3 PDC</A
+></DT
+><DD
+><DL
+><DT
+>26.1. <A
+HREF="nt4migration.html#AEN4012"
+>Planning and Getting Started</A
+></DT
+><DT
+>26.2. <A
+HREF="nt4migration.html#AEN4021"
+>Managing Samba-3 Domain Control</A
+></DT
+></DL
+></DD
+><DT
+>27. <A
 HREF="speed.html"
 >Samba performance issues</A
 ></DT
 ><DD
 ><DL
 ><DT
->23.1. <A
-HREF="speed.html#AEN3443"
+>27.1. <A
+HREF="speed.html#AEN4041"
 >Comparisons</A
 ></DT
 ><DT
->23.2. <A
-HREF="speed.html#AEN3449"
+>27.2. <A
+HREF="speed.html#AEN4047"
 >Socket options</A
 ></DT
 ><DT
->23.3. <A
-HREF="speed.html#AEN3456"
+>27.3. <A
+HREF="speed.html#AEN4054"
 >Read size</A
 ></DT
 ><DT
->23.4. <A
-HREF="speed.html#AEN3461"
+>27.4. <A
+HREF="speed.html#AEN4059"
 >Max xmit</A
 ></DT
 ><DT
->23.5. <A
-HREF="speed.html#AEN3466"
+>27.5. <A
+HREF="speed.html#AEN4064"
 >Log level</A
 ></DT
 ><DT
->23.6. <A
-HREF="speed.html#AEN3469"
+>27.6. <A
+HREF="speed.html#AEN4067"
 >Read raw</A
 ></DT
 ><DT
->23.7. <A
-HREF="speed.html#AEN3474"
+>27.7. <A
+HREF="speed.html#AEN4072"
 >Write raw</A
 ></DT
 ><DT
->23.8. <A
-HREF="speed.html#AEN3478"
+>27.8. <A
+HREF="speed.html#AEN4076"
 >Slow Clients</A
 ></DT
 ><DT
->23.9. <A
-HREF="speed.html#AEN3482"
+>27.9. <A
+HREF="speed.html#AEN4080"
 >Slow Logins</A
 ></DT
 ><DT
->23.10. <A
-HREF="speed.html#AEN3485"
+>27.10. <A
+HREF="speed.html#AEN4083"
 >Client tuning</A
 ></DT
 ></DL
 ></DD
 ><DT
->24. <A
+>28. <A
 HREF="portability.html"
 >Portability</A
 ></DT
 ><DD
 ><DL
 ><DT
->24.1. <A
-HREF="portability.html#AEN3525"
+>28.1. <A
+HREF="portability.html#AEN4127"
 >HPUX</A
 ></DT
 ><DT
->24.2. <A
-HREF="portability.html#AEN3531"
+>28.2. <A
+HREF="portability.html#AEN4133"
 >SCO Unix</A
 ></DT
 ><DT
->24.3. <A
-HREF="portability.html#AEN3535"
+>28.3. <A
+HREF="portability.html#AEN4137"
 >DNIX</A
 ></DT
 ><DT
->24.4. <A
-HREF="portability.html#AEN3564"
+>28.4. <A
+HREF="portability.html#AEN4166"
 >RedHat Linux Rembrandt-II</A
 ></DT
 ><DT
->24.5. <A
-HREF="portability.html#AEN3570"
+>28.5. <A
+HREF="portability.html#AEN4172"
 >AIX</A
 ></DT
 ></DL
 ></DD
 ><DT
->25. <A
+>29. <A
 HREF="other-clients.html"
 >Samba and other CIFS clients</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.1. <A
-HREF="other-clients.html#AEN3590"
+>29.1. <A
+HREF="other-clients.html#AEN4196"
 >Macintosh clients?</A
 ></DT
 ><DT
->25.2. <A
-HREF="other-clients.html#AEN3599"
+>29.2. <A
+HREF="other-clients.html#AEN4205"
 >OS2 Client</A
 ></DT
 ><DT
->25.3. <A
-HREF="other-clients.html#AEN3639"
+>29.3. <A
+HREF="other-clients.html#AEN4245"
 >Windows for Workgroups</A
 ></DT
 ><DT
->25.4. <A
-HREF="other-clients.html#AEN3663"
+>29.4. <A
+HREF="other-clients.html#AEN4269"
 >Windows '95/'98</A
 ></DT
 ><DT
->25.5. <A
-HREF="other-clients.html#AEN3679"
+>29.5. <A
+HREF="other-clients.html#AEN4285"
 >Windows 2000 Service Pack 2</A
 ></DT
+><DT
+>29.6. <A
+HREF="other-clients.html#AEN4302"
+>Windows NT 3.1</A
+></DT
 ></DL
 ></DD
 ><DT
->26. <A
+>30. <A
 HREF="compiling.html"
 >How to compile SAMBA</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.1. <A
-HREF="compiling.html#AEN3706"
+>30.1. <A
+HREF="compiling.html#AEN4323"
 >Access Samba source code via CVS</A
 ></DT
 ><DT
->26.2. <A
-HREF="compiling.html#AEN3749"
+>30.2. <A
+HREF="compiling.html#AEN4366"
 >Accessing the samba sources via rsync and ftp</A
 ></DT
 ><DT
->26.3. <A
-HREF="compiling.html#AEN3755"
+>30.3. <A
+HREF="compiling.html#AEN4372"
 >Building the Binaries</A
 ></DT
 ><DT
->26.4. <A
-HREF="compiling.html#AEN3812"
+>30.4. <A
+HREF="compiling.html#AEN4429"
 >Starting the smbd and nmbd</A
 ></DT
 ></DL
 ></DD
 ><DT
->27. <A
+>31. <A
 HREF="bugreport.html"
 >Reporting Bugs</A
 ></DT
 ><DD
 ><DL
 ><DT
->27.1. <A
-HREF="bugreport.html#AEN3874"
+>31.1. <A
+HREF="bugreport.html#AEN4500"
 >Introduction</A
 ></DT
 ><DT
->27.2. <A
-HREF="bugreport.html#AEN3884"
+>31.2. <A
+HREF="bugreport.html#AEN4510"
 >General info</A
 ></DT
 ><DT
->27.3. <A
-HREF="bugreport.html#AEN3890"
+>31.3. <A
+HREF="bugreport.html#AEN4516"
 >Debug levels</A
 ></DT
 ><DT
->27.4. <A
-HREF="bugreport.html#AEN3907"
+>31.4. <A
+HREF="bugreport.html#AEN4536"
 >Internal errors</A
 ></DT
 ><DT
->27.5. <A
-HREF="bugreport.html#AEN3917"
+>31.5. <A
+HREF="bugreport.html#AEN4550"
 >Attaching to a running process</A
 ></DT
 ><DT
->27.6. <A
-HREF="bugreport.html#AEN3920"
+>31.6. <A
+HREF="bugreport.html#AEN4558"
 >Patches</A
 ></DT
 ></DL
 ></DD
 ><DT
->28. <A
+>32. <A
 HREF="diagnosis.html"
 >The samba checklist</A
 ></DT
 ><DD
 ><DL
 ><DT
->28.1. <A
-HREF="diagnosis.html#AEN3943"
+>32.1. <A
+HREF="diagnosis.html#AEN4581"
 >Introduction</A
 ></DT
 ><DT
->28.2. <A
-HREF="diagnosis.html#AEN3948"
+>32.2. <A
+HREF="diagnosis.html#AEN4586"
 >Assumptions</A
 ></DT
 ><DT
->28.3. <A
-HREF="diagnosis.html#AEN3958"
->Tests</A
+>32.3. <A
+HREF="diagnosis.html#AEN4596"
+>The tests</A
 ></DT
 ><DT
->28.4. <A
-HREF="diagnosis.html#AEN4068"
+>32.4. <A
+HREF="diagnosis.html#AEN4697"
 >Still having troubles?</A
 ></DT
 ></DL
diff --git a/docs/htmldocs/samba-pdc.html b/docs/htmldocs/samba-pdc.html
index b61931e770..67f281f652 100644
--- a/docs/htmldocs/samba-pdc.html
+++ b/docs/htmldocs/samba-pdc.html
@@ -80,7 +80,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN785"
+NAME="AEN859"
 >6.1. Prerequisite Reading</A
 ></H1
 ><P
@@ -103,7 +103,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN790"
+NAME="AEN864"
 >6.2. Background</A
 ></H1
 ><P
@@ -250,7 +250,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN830"
+NAME="AEN904"
 >6.3. Configuring the Samba Domain Controller</A
 ></H1
 ><P
@@ -413,8 +413,7 @@ TARGET="_top"
 ><P
 >	Encrypted passwords must be enabled.  For more details on how 
 	to do this, refer to <A
-HREF="ENCRYPTION.html"
-TARGET="_top"
+HREF="passdb.html"
 >ENCRYPTION.html</A
 >.
 	</P
@@ -447,7 +446,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN872"
+NAME="AEN946"
 >6.4. Creating Machine Trust Accounts and Joining Clients to the Domain</A
 ></H1
 ><P
@@ -633,7 +632,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN915"
+NAME="AEN989"
 >6.4.1. Manual Creation of Machine Trust Accounts</A
 ></H2
 ><P
@@ -803,7 +802,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN956"
+NAME="AEN1030"
 >6.4.2. "On-the-Fly" Creation of Machine Trust Accounts</A
 ></H2
 ><P
@@ -840,7 +839,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN965"
+NAME="AEN1039"
 >6.4.3. Joining the Client to the Domain</A
 ></H2
 ><P
@@ -908,7 +907,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN980"
+NAME="AEN1054"
 >6.5. Common Problems and Errors</A
 ></H1
 ><P
@@ -1107,7 +1106,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1026"
+NAME="AEN1100"
 >6.6. What other help can I get?</A
 ></H1
 ><P
@@ -1527,7 +1526,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1140"
+NAME="AEN1214"
 >6.7. Domain Control for Windows 9x/ME</A
 ></H1
 ><P
@@ -1626,7 +1625,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1163"
+NAME="AEN1237"
 >6.7.1. Configuration Instructions:	Network Logons</A
 ></H2
 ><P
diff --git a/docs/htmldocs/securing-samba.html b/docs/htmldocs/securing-samba.html
index ad89fb8a9d..b1ecb68ce4 100644
--- a/docs/htmldocs/securing-samba.html
+++ b/docs/htmldocs/securing-samba.html
@@ -13,8 +13,8 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Stackable VFS modules"
-HREF="vfs.html"><LINK
+TITLE="Improved browsing in samba"
+HREF="improved-browsing.html"><LINK
 REL="NEXT"
 TITLE="Unicode/Charsets"
 HREF="unicode.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="vfs.html"
+HREF="improved-browsing.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="SECURING-SAMBA"
 ></A
->Chapter 21. Securing Samba</H1
+>Chapter 23. Securing Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3348"
->21.1. Introduction</A
+NAME="AEN3884"
+>23.1. Introduction</A
 ></H1
 ><P
 >This note was attached to the Samba 2.2.8 release notes as it contained an
@@ -93,8 +93,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3351"
->21.2. Using host based protection</A
+NAME="AEN3887"
+>23.2. Using host based protection</A
 ></H1
 ><P
 >In many installations of Samba the greatest threat comes for outside
@@ -125,8 +125,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3358"
->21.3. Using interface protection</A
+NAME="AEN3894"
+>23.3. Using interface protection</A
 ></H1
 ><P
 >By default Samba will accept connections on any network interface that
@@ -161,8 +161,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3367"
->21.4. Using a firewall</A
+NAME="AEN3903"
+>23.4. Using a firewall</A
 ></H1
 ><P
 >Many people use a firewall to deny access to services that they don't
@@ -191,8 +191,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3374"
->21.5. Using a IPC$ share deny</A
+NAME="AEN3910"
+>23.5. Using a IPC$ share deny</A
 ></H1
 ><P
 >If the above methods are not suitable, then you could also place a
@@ -230,8 +230,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3383"
->21.6. Upgrading Samba</A
+NAME="AEN3919"
+>23.6. Upgrading Samba</A
 ></H1
 ><P
 >Please check regularly on http://www.samba.org/ for updates and
@@ -256,7 +256,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="vfs.html"
+HREF="improved-browsing.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -284,7 +284,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Stackable VFS modules</TD
+>Improved browsing in samba</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/securitylevels.html b/docs/htmldocs/securitylevels.html
index 3d25e4d441..9d507dc7a4 100644
--- a/docs/htmldocs/securitylevels.html
+++ b/docs/htmldocs/securitylevels.html
@@ -89,7 +89,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN681"
+NAME="AEN752"
 >5.1. User and Share security level</A
 ></H1
 ><P
@@ -107,7 +107,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN684"
+NAME="AEN755"
 >5.1.1. User Level Security</A
 ></H2
 ><P
@@ -148,7 +148,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN694"
+NAME="AEN765"
 >5.1.2. Share Level Security</A
 ></H2
 ><P
@@ -179,7 +179,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN698"
+NAME="AEN769"
 >5.1.3. Server Level Security</A
 ></H2
 ><P
@@ -215,7 +215,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN703"
+NAME="AEN774"
 >5.1.3.1. Configuring Samba for Seemless Windows Network Integration</A
 ></H3
 ><P
@@ -327,7 +327,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN729"
+NAME="AEN800"
 >5.1.3.2. Use MS Windows NT as an authentication server</A
 ></H3
 ><P
@@ -363,7 +363,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN737"
+NAME="AEN808"
 >5.1.4. Domain Level Security</A
 ></H2
 ><P
@@ -381,7 +381,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN741"
+NAME="AEN812"
 >5.1.4.1. Samba as a member of an MS Windows NT security domain</A
 ></H3
 ><P
@@ -444,7 +444,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN758"
+NAME="AEN829"
 >5.1.5. ADS Level Security</A
 ></H2
 ><P
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index e66b848be7..6ebe2fc002 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -426,18 +426,42 @@ CLASS="COMPUTEROUTPUT"
 		first entry of a printcap record. Records are separated by newlines,
 		components (if there are more than one) are separated by vertical 
 		bar symbols ('|').</P
-><P
->NOTE: On SYSV systems which use lpstat to determine what 
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>On SYSV systems which use lpstat to determine what 
 		printers are defined on the system you may be able to use
 		"printcap name = lpstat" to automatically obtain a list 
 		of printers. See the "printcap name" option 
 		for more details.</P
+></TD
+></TR
+></TABLE
+></DIV
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN103"
+NAME="AEN104"
 ></A
 ><H2
 >PARAMETERS</H2
@@ -495,7 +519,7 @@ CLASS="EMPHASIS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN113"
+NAME="AEN114"
 ></A
 ><H2
 >VARIABLE SUBSTITUTIONS</H2
@@ -694,7 +718,7 @@ CLASS="EMPHASIS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN206"
+NAME="AEN207"
 ></A
 ><H2
 >NAME MANGLING</H2
@@ -799,7 +823,7 @@ CLASS="EMPHASIS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN239"
+NAME="AEN240"
 ></A
 ><H2
 >NOTE ABOUT USERNAME/PASSWORD VALIDATION</H2
@@ -875,7 +899,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN258"
+NAME="AEN259"
 ></A
 ><H2
 >COMPLETE LIST OF GLOBAL PARAMETERS</H2
@@ -1468,6 +1492,16 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#LDAPDELETEDN"
+><VAR
+CLASS="PARAMETER"
+>ldap delete dn</VAR
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#LDAPFILTER"
 ><VAR
 CLASS="PARAMETER"
@@ -2168,6 +2202,16 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#PRELOADMODULES"
+><VAR
+CLASS="PARAMETER"
+>preload modules</VAR
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#PRINTCAP"
 ><VAR
 CLASS="PARAMETER"
@@ -2318,6 +2362,16 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#SERVERSCHANNEL"
+><VAR
+CLASS="PARAMETER"
+>server schannel</VAR
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#SERVERSTRING"
 ><VAR
 CLASS="PARAMETER"
@@ -2328,6 +2382,16 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#SETPRIMARYGROUPSCRIPT"
+><VAR
+CLASS="PARAMETER"
+>set primary group script</VAR
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#SHOWADDPRINTERWIZARD"
 ><VAR
 CLASS="PARAMETER"
@@ -2780,7 +2844,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1018"
+NAME="AEN1035"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -4015,7 +4079,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1510"
+NAME="AEN1527"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -5218,7 +5282,7 @@ NAME="CASESENSITIVE"
 ><DD
 ><P
 >See the discussion in the section <A
-HREF="#AEN206"
+HREF="#AEN207"
 >NAME MANGLING</A
 >.</P
 ><P
@@ -5818,7 +5882,7 @@ NAME="DEFAULTCASE"
 ><DD
 ><P
 >See the section on <A
-HREF="#AEN206"
+HREF="#AEN207"
 >		NAME MANGLING</A
 >. Also note the <A
 HREF="#SHORTPRESERVECASE"
@@ -6915,7 +6979,7 @@ NAME="DOSCHARSET"
 		charset Samba should talk to DOS clients.
 		</P
 ><P
->The default depends on which charsets you have instaled. 
+>The default depends on which charsets you have installed. 
 		Samba tries to use charset 850 but falls back to ASCII in 
 		case it is not available. Run <SPAN
 CLASS="CITEREFENTRY"
@@ -8056,15 +8120,33 @@ CLASS="COMMAND"
 		the first ':'.  There should probably be a better parsing system 
 		that copes with different map formats and also Amd (another 
 		automounter) maps.</P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
 ><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOTE :</I
-></SPAN
 >A working NIS client is required on 
 		the system for this option to work.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >See also <A
 HREF="#NISHOMEDIR"
@@ -8337,14 +8419,28 @@ CLASS="PARAMETER"
 >		hosts equiv</VAR
 > may be useful for NT clients which will 
 		not supply passwords to Samba.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOTE :</I
-></SPAN
-> The use of <VAR
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>The use of <VAR
 CLASS="PARAMETER"
 >hosts equiv
 		</VAR
@@ -8364,6 +8460,10 @@ CLASS="EMPHASIS"
 ></SPAN
 > trust 
 		them :-).</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >Default: <SPAN
 CLASS="emphasis"
@@ -8875,14 +8975,25 @@ CLASS="REFENTRYTITLE"
 >smbpasswd</SPAN
 >(8)</SPAN
 > man page for more information on how 
-		to accmplish this.
+		to accmplish this.</P
+></DD
+><DT
+><A
+NAME="LDAPDELETEDN"
+></A
+>&#62;ldap delete dn (G)</DT
+><DD
+><P
+> This parameter specifies whether a delete
+		operation in the ldapsam deletes the complete entry or only the attributes
+		specific to Samba.
 		</P
 ><P
 >Default : <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
->none</I
+>ldap delete dn = no</I
 ></SPAN
 ></P
 ></DD
@@ -10445,7 +10556,7 @@ NAME="MANGLECASE"
 ><DD
 ><P
 >See the section on <A
-HREF="#AEN206"
+HREF="#AEN207"
 >		NAME MANGLING</A
 ></P
 ><P
@@ -10521,7 +10632,7 @@ NAME="MANGLEDNAMES"
 		or whether non-DOS names should simply be ignored.</P
 ><P
 >See the section on <A
-HREF="#AEN206"
+HREF="#AEN207"
 >		NAME MANGLING</A
 > for details on how to control the mangling process.</P
 ><P
@@ -10695,7 +10806,7 @@ CLASS="EMPHASIS"
 >magic</I
 ></SPAN
 > character in <A
-HREF="#AEN206"
+HREF="#AEN207"
 >name mangling</A
 >. The default is a '~'
 		but this may interfere with some software. Use this option to set 
@@ -11958,11 +12069,35 @@ NAME="NONUNIXACCOUNTRANGE"
                 This is most often used for machine account creation. 
                 This range of ids should have no existing local or NIS users within 
                 it as strange conflicts can occur otherwise.</P
-><P
->NOTE: These userids never appear on the system and Samba will never
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>These userids never appear on the system and Samba will never
                 'become' these users. They are used only to ensure that the algorithmic 
                 RID mapping does not conflict with normal users.
 		</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -13151,17 +13286,31 @@ CLASS="PARAMETER"
 > and so may resolved
 		by any method and order described in that parameter.</P
 ><P
->The password server much be a machine capable of using 
+>The password server must be a machine capable of using 
 		the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in 
 		user level security mode.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOTE:</I
-></SPAN
-> Using a password server 
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>Using a password server 
 		means your UNIX box (running Samba) is only as secure as your 
 		password server. <SPAN
 CLASS="emphasis"
@@ -13171,6 +13320,10 @@ CLASS="EMPHASIS"
 		YOU DON'T COMPLETELY TRUST</I
 ></SPAN
 >.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >Never point a Samba server at itself for password 
 		serving. This will cause a loop and could lock up your Samba 
@@ -13631,6 +13784,30 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="PRELOADMODULES"
+></A
+>&#62;preload modules (G)</DT
+><DD
+><P
+>This is a list of paths to modules that should 
+		be loaded into smbd before a client connects. This improves 
+		the speed of smbd when reacting to new connections somewhat. </P
+><P
+>It is recommended to only use this option on heavy-performance 
+		servers.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>preload modules = </B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>preload modules = /usr/lib/samba/passdb/mysql.so</B
+></P
+></DD
+><DT
+><A
 NAME="PRESERVECASE"
 ></A
 >&#62;preserve case (S)</DT
@@ -13653,7 +13830,7 @@ CLASS="COMMAND"
 ></P
 ><P
 >See the section on <A
-HREF="#AEN206"
+HREF="#AEN207"
 >NAME 
 		MANGLING</A
 > for a fuller discussion.</P
@@ -13950,14 +14127,28 @@ print5|My Printer 5</PRE
 >where the '|' separates aliases of a printer. The fact 
 		that the second alias has a space in it gives a hint to Samba 
 		that it's a comment.</P
-><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOTE</I
-></SPAN
->: Under AIX the default printcap 
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>Under AIX the default printcap 
 		name is <TT
 CLASS="FILENAME"
 >/etc/qconfig</TT
@@ -13970,6 +14161,10 @@ CLASS="FILENAME"
 CLASS="FILENAME"
 >qconfig</TT
 > appears in the printcap filename.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -15080,7 +15275,7 @@ CLASS="EMPHASIS"
 		be used in granting access.</P
 ><P
 >See also the section <A
-HREF="#AEN239"
+HREF="#AEN240"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -15161,7 +15356,7 @@ CLASS="PARAMETER"
 > parameter for details on doing this.</P
 ><P
 >See also the section <A
-HREF="#AEN239"
+HREF="#AEN240"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -15260,7 +15455,7 @@ CLASS="PARAMETER"
 > parameter for details on doing this.</P
 ><P
 >See also the section <A
-HREF="#AEN239"
+HREF="#AEN240"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -15395,7 +15590,7 @@ CLASS="PARAMETER"
 > parameter for details on doing this.</P
 ><P
 >See also the section <A
-HREF="#AEN239"
+HREF="#AEN240"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -15496,6 +15691,51 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="SERVERSCHANNEL"
+></A
+>&#62;server schannel (G)</DT
+><DD
+><P
+>This controls whether the server offers or even
+		demands the use of the netlogon schannel.
+		<VAR
+CLASS="PARAMETER"
+>server schannel = no</VAR
+> does not
+		offer the schannel, <VAR
+CLASS="PARAMETER"
+>server schannel =
+		auto</VAR
+> offers the schannel but does not
+		enforce it, and <VAR
+CLASS="PARAMETER"
+>server schannel =
+		yes</VAR
+> denies access if the client is not
+		able to speak netlogon schannel. This is only the case
+		for Windows NT4 before SP4.</P
+><P
+>Please note that with this set to
+		<VAR
+CLASS="PARAMETER"
+>no</VAR
+> you will have to apply the
+		WindowsXP requireSignOrSeal-Registry patch found in
+		the docs/Registry subdirectory.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>server schannel = auto</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>server schannel = yes</B
+>/para&#62;
+		</P
+></DD
+><DT
+><A
 NAME="SERVERSTRING"
 ></A
 >&#62;server string (G)</DT
@@ -15537,6 +15777,48 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="SETPRIMARYGROUPSCRIPT"
+></A
+>&#62;set primary group script (G)</DT
+><DD
+><P
+>Thanks to the Posix subsystem in NT a
+		Windows User has a primary group in addition to the
+		auxiliary groups.  This script sets the primary group
+		in the unix userdatase when an administrator sets the
+		primary group from the windows user manager or when
+		fetching a SAM with <B
+CLASS="COMMAND"
+>net rpc
+		vampire</B
+>. <VAR
+CLASS="PARAMETER"
+>%u</VAR
+> will be
+		replaced with the user whose primary group is to be
+		set.  <VAR
+CLASS="PARAMETER"
+>%g</VAR
+> will be replaced with
+		the group to set.
+
+		</P
+><P
+>Default: <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>No default value</I
+></SPAN
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>set primary group script = /usr/sbin/usermod -g '%g' '%u'</B
+></P
+></DD
+><DT
+><A
 NAME="SETDIRECTORY"
 ></A
 >&#62;set directory (S)</DT
@@ -15649,7 +15931,7 @@ CLASS="COMMAND"
 		names are lowered. </P
 ><P
 >See the section on <A
-HREF="#AEN206"
+HREF="#AEN207"
 >		NAME MANGLING</A
 >.</P
 ><P
@@ -16851,7 +17133,7 @@ CLASS="PARAMETER"
 		search.</P
 ><P
 >See the section <A
-HREF="#AEN239"
+HREF="#AEN240"
 >NOTE ABOUT 
 		USERNAME/PASSWORD VALIDATION</A
 > for more information on how 
@@ -17868,22 +18150,45 @@ CLASS="REFENTRYTITLE"
 >You should point this at your WINS server if you have a
 		multi-subnetted network.</P
 ><P
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->NOTE</I
-></SPAN
->. You need to set up Samba to point 
+>If you want to work in multiple namespaces, you can 
+		give every wins server a 'tag'. For each tag, only one 
+		(working) server will be queried for a name. The tag should be 
+		seperated from the ip address by a colon.
+		</P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>You need to set up Samba to point 
 		to a WINS server if you have multiple subnets and wish cross-subnet 
 		browsing to work correctly.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >See the documentation file <A
 HREF="improved-browsing.html"
 TARGET="_top"
->BROWSING</A
-> 
-		in the docs/ directory of your Samba source distribution.</P
+>Browsing</A
+> in the samba howto collection.</P
 ><P
 >Default: <SPAN
 CLASS="emphasis"
@@ -17895,7 +18200,17 @@ CLASS="EMPHASIS"
 ><P
 >Example: <B
 CLASS="COMMAND"
->wins server = 192.9.200.1</B
+>wins server = mary:192.9.200.1 fred:192.168.3.199 mary:192.168.2.61</B
+></P
+><P
+>For this example when querying a certain name, 192.19.200.1 will 
+		be asked first and if that doesn't respond 192.168.2.61. If either 
+		of those doesn't know the name 192.168.3.199 will be queried.
+		</P
+><P
+>Example: <B
+CLASS="COMMAND"
+>wins server = 192.9.200.1 192.168.2.61</B
 ></P
 ></DD
 ><DT
@@ -18146,7 +18461,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6228"
+NAME="AEN6291"
 ></A
 ><H2
 >WARNINGS</H2
@@ -18177,7 +18492,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6236"
+NAME="AEN6299"
 ></A
 ><H2
 >VERSION</H2
@@ -18187,7 +18502,7 @@ NAME="AEN6236"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6239"
+NAME="AEN6302"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -18251,7 +18566,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6269"
+NAME="AEN6332"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbcacls.1.html b/docs/htmldocs/smbcacls.1.html
index 7500bdaeea..fa70a288cd 100644
--- a/docs/htmldocs/smbcacls.1.html
+++ b/docs/htmldocs/smbcacls.1.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbcacls</B
->  {//server/share} {filename} [-U username] [-A acls] [-M acls] [-D acls] [-S acls] [-C name] [-G name] [-n] [-h]</P
+>  {//server/share} {filename} [-D acls] [-M acls] [-A acls] [-S acls] [-C name] [-G name] [-n] [-t] [-U username] [-h] [-d]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22"
+NAME="AEN24"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -64,7 +64,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30"
+NAME="AEN32"
 ></A
 ><H2
 >OPTIONS</H2
@@ -168,14 +168,98 @@ CLASS="PARAMETER"
 		and masks to a readable string format.  </P
 ></DD
 ><DT
->-h</DT
+>-t</DT
 ><DD
 ><P
->Print usage information on the <B
+>		Don't actually do anything, only validate the correctness of 
+		the arguments.
+		</P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
+><DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
 CLASS="COMMAND"
->smbcacls
-		</B
-> program.</P
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
+>-d|--debug=debuglevel</DT
+><DD
+><P
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
+></DD
+><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ></DL
 ></DIV
@@ -183,7 +267,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79"
+NAME="AEN111"
 ></A
 ><H2
 >ACL FORMAT</H2
@@ -367,7 +451,7 @@ CLASS="EMPHASIS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN133"
+NAME="AEN165"
 ></A
 ><H2
 >EXIT STATUS</H2
@@ -391,17 +475,17 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN139"
+NAME="AEN171"
 ></A
 ><H2
 >VERSION</H2
 ><P
->This man page is correct for version 2.2 of the Samba suite.</P
+>This man page is correct for version 3.0 of the Samba suite.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN142"
+NAME="AEN174"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 4a287acf1d..9ea84de950 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -172,34 +172,6 @@ CLASS="PARAMETER"
 		</P
 ></DD
 ><DT
->-s smb.conf</DT
-><DD
-><P
->Specifies the location of the all 
-		important <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> file. </P
-></DD
-><DT
->-O socket options</DT
-><DD
-><P
->TCP socket options to set on the client 
-		socket. See the socket options parameter in 
-		the <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> manual page for the list of valid 
-		options. </P
-></DD
-><DT
 >-R &#60;name resolve order&#62;</DT
 ><DD
 ><P
@@ -369,102 +341,6 @@ CLASS="EMPHASIS"
 		messages. </P
 ></DD
 ><DT
->-i scope</DT
-><DD
-><P
->This specifies a NetBIOS scope that smbclient will 
-		use to communicate with when generating NetBIOS names. For details 
-		on the use of NetBIOS scopes, see <TT
-CLASS="FILENAME"
->rfc1001.txt</TT
-> 
-		and <TT
-CLASS="FILENAME"
->rfc1002.txt</TT
->.
-		NetBIOS scopes are <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->very</I
-></SPAN
-> rarely used, only set 
-		this parameter if you are the system administrator in charge of all 
-		the NetBIOS systems you communicate with. </P
-></DD
-><DT
->-N</DT
-><DD
-><P
->If specified, this parameter suppresses the normal 
-		password prompt from the client to the user. This is useful when 
-		accessing a service that does not require a password. </P
-><P
->Unless a password is specified on the command line or 
-		this parameter is specified, the client will request a 
-		password.</P
-></DD
-><DT
->-n NetBIOS name</DT
-><DD
-><P
->By default, the client will use the local 
-		machine's hostname (in uppercase) as its NetBIOS name. This parameter 
-		allows you to override the host name and use whatever NetBIOS 
-		name you wish. </P
-></DD
-><DT
->-d debuglevel</DT
-><DD
-><P
-><VAR
-CLASS="REPLACEABLE"
->debuglevel</VAR
-> is an integer from 0 to 10, or 
-		the letter 'A'. </P
-><P
->The default value if this parameter is not specified 
-		is zero. </P
-><P
->The higher this value, the more detail will be logged to 
-		the log files about the activities of the 
-		client. At level 0, only critical errors and serious warnings will 
-		be logged. Level 1 is a reasonable level for day to day running - 
-		it generates a small amount of information about operations 
-		carried out. </P
-><P
->Levels above 1 will generate considerable amounts of log 
-		data, and should only be used when investigating a problem.
-		Levels above 3 are designed for use only by developers and 
-		generate HUGE amounts of log data, most of which is extremely 
-		cryptic. If <VAR
-CLASS="REPLACEABLE"
->debuglevel</VAR
-> is set to the letter 'A', then <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all
-		</I
-></SPAN
->  debug messages will be printed. This setting
-		is for developers only (and people who <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->really</I
-></SPAN
-> want 
-		to know how the code works internally). </P
-><P
->Note that specifying this parameter here will override
-		the log level parameter in the <TT
-CLASS="FILENAME"
->smb.conf (5)</TT
-> 
-		file. </P
-></DD
-><DT
 >-p port</DT
 ><DD
 ><P
@@ -497,10 +373,10 @@ CLASS="FILENAME"
 		</P
 ></DD
 ><DT
->-h</DT
+>-h|--help</DT
 ><DD
 ><P
->Print the usage message for the client. </P
+>Print a summary of command line options.</P
 ></DD
 ><DT
 >-I IP-address</DT
@@ -539,86 +415,6 @@ CLASS="PARAMETER"
 		- typically the user's tty. </P
 ></DD
 ><DT
->-U username[%pass]</DT
-><DD
-><P
->Sets the SMB username or username and password. 
-		If %pass is not specified, The user will be prompted. The client 
-		will first check the <VAR
-CLASS="ENVAR"
->USER</VAR
-> environment variable, then the 
-		<VAR
-CLASS="ENVAR"
->LOGNAME</VAR
-> variable and if either exists, the 
-		string is uppercased. Anything in these variables following a '%' 
-		sign will be treated as the password. If these environment 
-		variables are not found, the username <CODE
-CLASS="CONSTANT"
->GUEST</CODE
-> 
-		is used. </P
-><P
->If the password is not included in these environment
-		variables (using the %pass syntax), <B
-CLASS="COMMAND"
->smbclient</B
-> will look for 
-		a <VAR
-CLASS="ENVAR"
->PASSWD</VAR
-> environment variable from which 
-		to read the password. </P
-><P
->A third option is to use a credentials file which 
-		contains the plaintext of the domain name, username and password.  This 
-		option is mainly provided for scripts where the admin doesn't 
-		wish to pass the credentials on the command line or via environment 
-		variables. If this method is used, make certain that the permissions 
-		on the file restrict access from unwanted users.  See the 
-		<VAR
-CLASS="PARAMETER"
->-A</VAR
-> for more details. </P
-><P
->Be cautious about including passwords in scripts or in 
-		the <VAR
-CLASS="ENVAR"
->PASSWD</VAR
-> environment variable. Also, on 
-		many systems the command line of a running process may be seen 
-		via the <B
-CLASS="COMMAND"
->ps</B
-> command to be safe always allow 
-		<B
-CLASS="COMMAND"
->smbclient</B
-> to prompt for a password and type 
-		it in directly. </P
-></DD
-><DT
->-A filename</DT
-><DD
-><P
->This option allows 
-		you to specify a file from which to read the username, domain name, and 
-		password used in the connection.  The format of the file is 
-		</P
-><P
-><PRE
-CLASS="PROGRAMLISTING"
->username = &#60;value&#62; 
-password = &#60;value&#62;
-domain = &#60;value&#62;</PRE
-></P
-><P
->If the domain parameter is missing the current workgroup name
-		is used instead. Make certain that the permissions on the file restrict 
-		access from unwanted users. </P
-></DD
-><DT
 >-L</DT
 ><DD
 ><P
@@ -680,18 +476,241 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
->-W WORKGROUP</DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
+>-d|--debug=debuglevel</DT
+><DD
+><P
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
+></DD
+><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
+></DD
+><DT
+>-N</DT
+><DD
+><P
+>If specified, this parameter suppresses the normal
+password prompt from the client to the user. This is useful when
+accessing a service that does not require a password. </P
+><P
+>Unless a password is specified on the command line or
+this parameter is specified, the client will request a
+password.</P
+></DD
+><DT
+>-k</DT
+><DD
+><P
+>Try to authenticate with kerberos. Only useful in
+an Active Directory environment.</P
+></DD
+><DT
+>-A|--authfile=filename</DT
 ><DD
 ><P
->Override the default workgroup (domain) specified
-		in the workgroup parameter of the <SPAN
+>This option allows
+you to specify a file from which to read the username and
+password used in the connection.  The format of the file is</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+>username = &#60;value&#62;
+password = &#60;value&#62;
+domain   = &#60;value&#62;</PRE
+></P
+><P
+>Make certain that the permissions on the file restrict 
+access from unwanted users. </P
+></DD
+><DT
+>-U|--user=username[%password]</DT
+><DD
+><P
+>Sets the SMB username or username and password. </P
+><P
+>If %password is not specified, the user will be prompted. The
+client will first check the <VAR
+CLASS="ENVAR"
+>USER</VAR
+> environment variable, then the
+<VAR
+CLASS="ENVAR"
+>LOGNAME</VAR
+> variable and if either exists, the
+string is uppercased. If these environmental variables are not
+found, the username <CODE
+CLASS="CONSTANT"
+>GUEST</CODE
+> is used. </P
+><P
+>A third option is to use a credentials file which
+contains the plaintext of the username and password.  This
+option is mainly provided for scripts where the admin does not
+wish to pass the credentials on the command line or via environment
+variables. If this method is used, make certain that the permissions
+on the file restrict access from unwanted users.  See the
+<VAR
+CLASS="PARAMETER"
+>-A</VAR
+> for more details. </P
+><P
+>Be cautious about including passwords in scripts. Also, on
+many systems the command line of a running process may be seen
+via the <B
+CLASS="COMMAND"
+>ps</B
+> command.  To be safe always allow
+<B
+CLASS="COMMAND"
+>rpcclient</B
+> to prompt for a password and type
+it in directly. </P
+></DD
+><DT
+>-n &#60;primary NetBIOS name&#62;</DT
+><DD
+><P
+>This option allows you to override
+the NetBIOS name that Samba uses for itself. This is identical
+to setting the <A
+HREF="smb.conf.5.html#netbiosname"
+TARGET="_top"
+><VAR
+CLASS="PARAMETER"
+>NetBIOS
+name</VAR
+></A
+> parameter in the <SPAN
 CLASS="CITEREFENTRY"
 ><SPAN
 CLASS="REFENTRYTITLE"
 >smb.conf</SPAN
 >(5)</SPAN
->	file for this connection. This may be 
-		needed to connect to some servers. </P
+> file.  However, a command
+line setting will take precedence over settings in
+<SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+>.</P
+></DD
+><DT
+>-i &#60;scope&#62;</DT
+><DD
+><P
+>This specifies a NetBIOS scope that
+<B
+CLASS="COMMAND"
+>nmblookup</B
+> will use to communicate with when
+generating NetBIOS names. For details on the use of NetBIOS
+scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>very</I
+></SPAN
+> rarely used, only set this parameter
+if you are the system administrator in charge of all the
+NetBIOS systems you communicate with.</P
+></DD
+><DT
+>-W|--workgroup=domain</DT
+><DD
+><P
+>Set the SMB domain of the username.   This
+overrides the default domain which is the domain defined in
+smb.conf.  If the domain specified is the same as the servers 
+NetBIOS name, it causes the client to log on using the servers local 
+SAM (as opposed to the Domain SAM). </P
+></DD
+><DT
+>-O socket options</DT
+><DD
+><P
+>TCP socket options to set on the client
+socket. See the socket options parameter in
+the <SPAN
+CLASS="CITEREFENTRY"
+><SPAN
+CLASS="REFENTRYTITLE"
+>smb.conf</SPAN
+>(5)</SPAN
+> manual page for the list of valid
+options. </P
 ></DD
 ><DT
 >-T tar options</DT
@@ -958,21 +977,13 @@ CLASS="COMMAND"
 >-c 'print -'</B
 >. </P
 ></DD
-><DT
->-k</DT
-><DD
-><P
->		Try to authenticate with kerberos. Only useful in 
-		an Active Directory environment.
-		</P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN336"
+NAME="AEN344"
 ></A
 ><H2
 >OPERATIONS</H2
@@ -1438,7 +1449,7 @@ CLASS="REPLACEABLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN527"
+NAME="AEN535"
 ></A
 ><H2
 >NOTES</H2
@@ -1459,7 +1470,7 @@ NAME="AEN527"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN532"
+NAME="AEN540"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -1492,7 +1503,7 @@ CLASS="ENVAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN540"
+NAME="AEN548"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -1536,7 +1547,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN552"
+NAME="AEN560"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -1552,7 +1563,7 @@ NAME="AEN552"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN556"
+NAME="AEN564"
 ></A
 ><H2
 >VERSION</H2
@@ -1562,7 +1573,7 @@ NAME="AEN556"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN559"
+NAME="AEN567"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbcontrol.1.html b/docs/htmldocs/smbcontrol.1.html
index dcea1b564a..e81e50337b 100644
--- a/docs/htmldocs/smbcontrol.1.html
+++ b/docs/htmldocs/smbcontrol.1.html
@@ -37,7 +37,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbcontrol</B
->  [-i]</P
+>  [-i] [-s]</P
 ><P
 ><B
 CLASS="COMMAND"
@@ -47,7 +47,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17"
+NAME="AEN18"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -87,7 +87,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN34"
+NAME="AEN35"
 ></A
 ><H2
 >OPTIONS</H2
@@ -97,6 +97,32 @@ NAME="AEN34"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
 >-i</DT
 ><DD
 ><P
@@ -140,116 +166,109 @@ CLASS="FILENAME"
 >message-type</DT
 ><DD
 ><P
->One of: <CODE
-CLASS="CONSTANT"
->close-share</CODE
->,
-		<CODE
-CLASS="CONSTANT"
->debug</CODE
->, 
-		<CODE
-CLASS="CONSTANT"
->force-election</CODE
->, <CODE
-CLASS="CONSTANT"
->ping
-		</CODE
->, <CODE
+>Type of message to send. See 
+		the section <CODE
 CLASS="CONSTANT"
->profile</CODE
->, <CODE
-CLASS="CONSTANT"
->		debuglevel</CODE
->, <CODE
-CLASS="CONSTANT"
->profilelevel</CODE
->, 
-		or <CODE
-CLASS="CONSTANT"
->printnotify</CODE
->.</P
+>MESSAGE-TYPES</CODE
+> for details.
+		</P
+></DD
+><DT
+>parameters</DT
+><DD
 ><P
->The <CODE
-CLASS="CONSTANT"
->close-share</CODE
-> message-type sends a 
-		message to smbd which will then close the client connections to
-		the named share. Note that this doesn't affect client connections
-		to any other shares. This message-type takes an argument of the
-		share name for which client connections will be closed, or the
-		"*" character which will close all currently open shares.
-		This may be useful if you made changes to the access controls on the share.
-		This message can only be sent to <CODE
+>any parameters required for the message-type</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN73"
+></A
+><H2
+>MESSAGE-TYPES</H2
+><P
+>Available message types are:</P
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>close-share</DT
+><DD
+><P
+>Order smbd to close the client 
+	connections to the named share. Note that this doesn't affect client 
+	connections to any other shares. This message-type takes an argument of the
+	share name for which client connections will be closed, or the
+	"*" character which will close all currently open shares.
+	This may be useful if you made changes to the access controls on the share.
+	This message can only be sent to <CODE
 CLASS="CONSTANT"
 >smbd</CODE
 >.</P
+></DD
+><DT
+>debug</DT
+><DD
 ><P
->The <CODE
-CLASS="CONSTANT"
->debug</CODE
-> message-type allows 
-		the debug level to be set to the value specified by the 
-		parameter. This can be sent to any of the destinations.</P
+>Set debug level to the value specified by the 
+	parameter. This can be sent to any of the destinations.</P
+></DD
+><DT
+>force-election</DT
+><DD
 ><P
->The <CODE
-CLASS="CONSTANT"
->force-election</CODE
-> message-type can only be 
-		sent to the <CODE
-CLASS="CONSTANT"
->nmbd</CODE
-> destination. This message 
-		causes the <B
+>This message causes the <B
 CLASS="COMMAND"
 >nmbd</B
-> daemon to force a new browse
-		master election.</P
+> daemon to 
+	force a new browse master election. </P
+></DD
+><DT
+>ping</DT
+><DD
 ><P
->The <CODE
-CLASS="CONSTANT"
->ping</CODE
-> message-type sends the 
-		number of "ping" messages specified by the parameter and waits 
-		for the same number of  reply "pong" messages. This can be sent to 
-		any of the destinations.</P
+>	Send specified number of "ping" messages and 
+	wait for the same number of  reply "pong" messages. This can be sent to 
+	any of the destinations.</P
+></DD
+><DT
+>profile</DT
+><DD
 ><P
->The <CODE
-CLASS="CONSTANT"
->profile</CODE
-> message-type sends a 
-		message to an smbd to change the profile settings based on the 
-		parameter. The parameter can be "on" to turn on profile stats 
-		collection, "off" to turn off profile stats collection, "count"
-		to enable only collection of count stats (time stats are 
-		disabled), and "flush" to zero the current profile stats. This can 
-		be sent to any smbd or nmbd destinations.</P
-><P
->The <CODE
-CLASS="CONSTANT"
->debuglevel</CODE
-> message-type sends 
-		a "request debug level" message. The current debug level setting 
-		is returned by a  "debuglevel" message. This can be 
-		sent to any of the destinations.</P
+>Change profile settings of a daemon, based on the 
+	parameter. The parameter can be "on" to turn on profile stats 
+	collection, "off" to turn off profile stats collection, "count"
+	to enable only collection of count stats (time stats are 
+	disabled), and "flush" to zero the current profile stats. This can 
+	be sent to any smbd or nmbd destinations.</P
+></DD
+><DT
+>debuglevel</DT
+><DD
 ><P
->The <CODE
-CLASS="CONSTANT"
->profilelevel</CODE
-> message-type sends 
-		a "request profile level" message.  The current profile level 
-		setting is returned by a  "profilelevel" message. This can be sent 
-		to any smbd or nmbd destinations.</P
+>	Request debuglevel of a certain daemon and write it to stdout. This 
+	can be sent to any of the destinations.</P
+></DD
+><DT
+>profilelevel</DT
+><DD
+><P
+>	Request profilelevel of a certain daemon and write it to stdout. 
+	This can be sent to any smbd or nmbd destinations.</P
+></DD
+><DT
+>printnotify</DT
+><DD
+><P
+>	Order smbd to send a printer notify message to any Windows NT clients 
+	connected to a printer. This message-type takes the following arguments:
+	</P
 ><P
->The <CODE
-CLASS="CONSTANT"
->printnotify</CODE
-> message-type sends a 
-		message to smbd which in turn sends a printer notify message to 
-		any Windows NT clients connected to a printer. This message-type
-		takes the following arguments:
-
-		<P
 ></P
 ><DIV
 CLASS="VARIABLELIST"
@@ -259,58 +278,130 @@ CLASS="VARIABLELIST"
 ><DD
 ><P
 >Send a queue pause change notify
-		    message to the printer specified.</P
+	    message to the printer specified.</P
 ></DD
 ><DT
 >queueresume printername</DT
 ><DD
 ><P
 >Send a queue resume change notify
-		    message for the printer specified.</P
+	    message for the printer specified.</P
 ></DD
 ><DT
 >jobpause printername unixjobid</DT
 ><DD
 ><P
 >Send a job pause change notify
-		    message for the printer and unix jobid
-		    specified.</P
+	    message for the printer and unix jobid
+	    specified.</P
 ></DD
 ><DT
 >jobresume printername unixjobid</DT
 ><DD
 ><P
 >Send a job resume change notify
-		    message for the printer and unix jobid
-		    specified.</P
+	    message for the printer and unix jobid
+	    specified.</P
 ></DD
 ><DT
 >jobdelete printername unixjobid</DT
 ><DD
 ><P
 >Send a job delete change notify
-		    message for the printer and unix jobid
-		    specified.</P
+	    message for the printer and unix jobid
+	    specified.</P
 ></DD
 ></DL
 ></DIV
->
-
-		Note that this message only sends notification that an
-		event has occured.  It doesn't actually cause the
-		event to happen.
-
-		This message can only be sent to <CODE
+><P
+>	Note that this message only sends notification that an
+	event has occured.  It doesn't actually cause the
+	event to happen.
+	</P
+><P
+>This message can only be sent to <CODE
 CLASS="CONSTANT"
 >smbd</CODE
->. 
-		</P
+>. </P
 ></DD
 ><DT
->parameters</DT
+>samsync</DT
 ><DD
 ><P
->any parameters required for the message-type</P
+>Order smbd to synchronise sam database from PDC (being BDC). Can only be sent to <CODE
+CLASS="CONSTANT"
+>smbd</CODE
+>. </P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="90%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>Not working at the moment</P
+></TD
+></TR
+></TABLE
+></DIV
+></DD
+><DT
+>samrepl</DT
+><DD
+><P
+>Send sam replication message, with specified serial. Can only be sent to <CODE
+CLASS="CONSTANT"
+>smbd</CODE
+>. Should not be used manually.</P
+></DD
+><DT
+>dmalloc-mark</DT
+><DD
+><P
+>Set a mark for dmalloc. Can be sent to both smbd and nmbd. Only available if samba is built with dmalloc support. </P
+></DD
+><DT
+>dmalloc-log-changed</DT
+><DD
+><P
+>	Dump the pointers that have changed since the mark set by dmalloc-mark. 
+	Can be sent to both smbd and nmbd. Only available if samba is built with dmalloc support. </P
+></DD
+><DT
+>shutdown</DT
+><DD
+><P
+>Shut down specified daemon. Can be sent to both smbd and nmbd.</P
+></DD
+><DT
+>tallocdump and pool-usage</DT
+><DD
+><P
+>Print a human-readable description of all 
+	talloc(pool) memory usage by the specified daemon/process. Available 
+	for both smbd and nmbd.</P
+></DD
+><DT
+>drvupgrade</DT
+><DD
+><P
+>Force clients of printers using specified driver 
+	to update their local version of the driver. Can only be 
+	sent to smbd.</P
 ></DD
 ></DL
 ></DIV
@@ -318,18 +409,18 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN110"
+NAME="AEN167"
 ></A
 ><H2
 >VERSION</H2
 ><P
->This man page is correct for version 2.2 of 
+>This man page is correct for version 3.0 of 
 	the Samba suite.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN113"
+NAME="AEN170"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -351,7 +442,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN122"
+NAME="AEN179"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 6f1cb8c057..afd70cbe03 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -200,74 +200,99 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
->-h</DT
-><DD
-><P
->Prints the help information (usage) 
-		for <B
-CLASS="COMMAND"
->smbd</B
->.</P
-></DD
-><DT
 >-V</DT
 ><DD
 ><P
 >Prints the version number for 
-		<B
+<B
 CLASS="COMMAND"
 >smbd</B
 >.</P
 ></DD
 ><DT
->-b</DT
+>-s &#60;configuration file&#62;</DT
 ><DD
 ><P
->Prints information about how 
-		Samba was built.</P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
 ></DD
 ><DT
->-d &#60;debug level&#62;</DT
+>-d|--debug=debuglevel</DT
 ><DD
 ><P
 ><VAR
 CLASS="REPLACEABLE"
 >debuglevel</VAR
 > is an integer 
-		from 0 to 10.  The default value if this parameter is 
-		not specified is zero.</P
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
 ><P
 >The higher this value, the more detail will be 
-		logged to the log files about the activities of the 
-		server. At level 0, only critical errors and serious 
-		warnings will be logged. Level 1 is a reasonable level for
-		day to day running - it generates a small amount of 
-		information about operations carried out.</P
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
 ><P
 >Levels above 1 will generate considerable 
-		amounts of log data, and should only be used when 
-		investigating a problem. Levels above 3 are designed for 
-		use only by developers and generate HUGE amounts of log
-		data, most of which is extremely cryptic.</P
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
 ><P
 >Note that specifying this parameter here will 
-		override the <A
+override the <A
 HREF="smb.conf.5.html#loglevel"
 TARGET="_top"
-><VAR
-CLASS="PARAMETER"
 >log
-		level</VAR
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
 ></A
-> parameter in the <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
 > file.</P
 ></DD
 ><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
+><DT
+>-b</DT
+><DD
+><P
+>Prints information about how 
+		Samba was built.</P
+></DD
+><DT
 >-l &#60;log directory&#62;</DT
 ><DD
 ><P
@@ -312,26 +337,6 @@ CLASS="COMMAND"
 		compile time.</P
 ></DD
 ><DT
->-O &#60;socket options&#62;</DT
-><DD
-><P
->See the <A
-HREF="smb.conf.5.html#socketoptions"
-TARGET="_top"
-><VAR
-CLASS="PARAMETER"
->socket options</VAR
-></A
-> 
-		parameter in the <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> file for details.</P
-></DD
-><DT
 >-p &#60;port number&#62;</DT
 ><DD
 ><P
@@ -360,32 +365,13 @@ CLASS="REPLACEABLE"
 >This parameter is not normally specified except 
 		in the above situation.</P
 ></DD
-><DT
->-s &#60;configuration file&#62;</DT
-><DD
-><P
->The file specified contains the 
-		configuration details required by the server.  The 
-		information in this file includes server-specific
-		information such as what printcap file to use, as well 
-		as descriptions of all the services that the server is 
-		to provide. See <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> for more information.
-		The default configuration file name is determined at 
-		compile time.</P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN135"
+NAME="AEN127"
 ></A
 ><H2
 >FILES</H2
@@ -493,7 +479,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN173"
+NAME="AEN165"
 ></A
 ><H2
 >LIMITATIONS</H2
@@ -512,7 +498,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN177"
+NAME="AEN169"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -543,7 +529,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN186"
+NAME="AEN178"
 ></A
 ><H2
 >PAM INTERACTION</H2
@@ -604,7 +590,7 @@ CLASS="EMPHASIS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN201"
+NAME="AEN193"
 ></A
 ><H2
 >VERSION</H2
@@ -615,7 +601,7 @@ NAME="AEN201"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN204"
+NAME="AEN196"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -638,7 +624,7 @@ NAME="AEN204"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN209"
+NAME="AEN201"
 ></A
 ><H2
 >SIGNALS</H2
@@ -705,7 +691,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN227"
+NAME="AEN219"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -771,7 +757,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN254"
+NAME="AEN246"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbmnt.8.html b/docs/htmldocs/smbmnt.8.html
index 1eabc3ce0e..28be79c391 100644
--- a/docs/htmldocs/smbmnt.8.html
+++ b/docs/htmldocs/smbmnt.8.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbmnt</B
->  {mount-point} [-s &#60;share&#62;] [-r] [-u &#60;uid&#62;] [-g &#60;gid&#62;] [-f &#60;mask&#62;] [-d &#60;mask&#62;] [-o &#60;options&#62;]</P
+>  {mount-point} [-s &#60;share&#62;] [-r] [-u &#60;uid&#62;] [-g &#60;gid&#62;] [-f &#60;mask&#62;] [-d &#60;mask&#62;] [-o &#60;options&#62;] [-h]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19"
+NAME="AEN20"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -79,7 +79,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN31"
+NAME="AEN32"
 ></A
 ><H2
 >OPTIONS</H2
@@ -131,13 +131,19 @@ CLASS="VARIABLELIST"
 		command is run on a 2.4 or higher Linux kernel.
 		</P
 ></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN58"
+NAME="AEN63"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index 0844c21a7d..5ea2935a3f 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -181,6 +181,12 @@ CLASS="FILENAME"
 		</P
 ></DD
 ><DT
+>krb</DT
+><DD
+><P
+>Use kerberos (Active Directory). </P
+></DD
+><DT
 >netbiosname=&#60;arg&#62;</DT
 ><DD
 ><P
@@ -224,7 +230,7 @@ CLASS="FILENAME"
 >dmask=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the directory mask. This determines the 
+>Sets the directory mask. This determines the 
 		permissions that remote directories have in the local filesystem. 
 		The default is based on the current umask. </P
 ></DD
@@ -232,7 +238,7 @@ CLASS="FILENAME"
 >debug=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the debug level. This is useful for 
+>Sets the debug level. This is useful for 
 		tracking down SMB connection problems. A suggested value to
 		start with is 4. If set too high there will be a lot of
 		output, possibly hiding the useful output.</P
@@ -241,20 +247,20 @@ CLASS="FILENAME"
 >ip=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the destination host or IP address.
+>Sets the destination host or IP address.
 		</P
 ></DD
 ><DT
 >workgroup=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the workgroup on the destination </P
+>Sets the workgroup on the destination </P
 ></DD
 ><DT
 >sockopt=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the TCP socket options. See the <A
+>Sets the TCP socket options. See the <A
 HREF="smb.conf.5.html#SOCKETOPTIONS"
 TARGET="_top"
 ><SPAN
@@ -274,13 +280,13 @@ CLASS="PARAMETER"
 >scope=&#60;arg&#62;</DT
 ><DD
 ><P
->sets the NetBIOS scope </P
+>Sets the NetBIOS scope </P
 ></DD
 ><DT
 >guest</DT
 ><DD
 ><P
->don't prompt for a password </P
+>Don't prompt for a password </P
 ></DD
 ><DT
 >ro</DT
@@ -334,7 +340,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN130"
+NAME="AEN134"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -366,7 +372,7 @@ CLASS="ENVAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN138"
+NAME="AEN142"
 ></A
 ><H2
 >BUGS</H2
@@ -401,7 +407,7 @@ NAME="AEN138"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN147"
+NAME="AEN151"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -423,7 +429,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN155"
+NAME="AEN159"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbsh.1.html b/docs/htmldocs/smbsh.1.html
index 625f63d260..0ed7722b71 100644
--- a/docs/htmldocs/smbsh.1.html
+++ b/docs/htmldocs/smbsh.1.html
@@ -130,16 +130,75 @@ CLASS="EMPHASIS"
 		</P
 ></DD
 ><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
+>-d|--debug=debuglevel</DT
+><DD
+><P
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
+></DD
+><DT
 >-R &#60;name resolve order&#62;</DT
 ><DD
 ><P
 >This option is used to determine what naming 
-		services and in what order to resolve 
-		host names to IP addresses. The option takes a space-separated 
-		string of different name resolution options.</P
+services and in what order to resolve 
+host names to IP addresses. The option takes a space-separated 
+string of different name resolution options.</P
 ><P
 >The options are: "lmhosts", "host", "wins" and "bcast". 
-		They cause names to be resolved as follows :</P
+They cause names to be resolved as follows :</P
 ><P
 ></P
 ><UL
@@ -149,18 +208,17 @@ CLASS="EMPHASIS"
 CLASS="CONSTANT"
 >lmhosts</CODE
 >: 
-			Lookup an IP address in the Samba lmhosts file. If the 
-			line in lmhosts has no name type attached to the 
-			NetBIOS name 
-			(see the <SPAN
+Lookup an IP address in the Samba lmhosts file. If the 
+line in lmhosts has no name type attached to the 
+NetBIOS name 
+(see the <SPAN
 CLASS="CITEREFENTRY"
 ><SPAN
 CLASS="REFENTRYTITLE"
 >lmhosts</SPAN
 >(5)</SPAN
 >	for details) 
-			then any name type matches for lookup.
-			</P
+then any name type matches for lookup.</P
 ></LI
 ><LI
 ><P
@@ -168,21 +226,19 @@ CLASS="REFENTRYTITLE"
 CLASS="CONSTANT"
 >host</CODE
 >: 
-			Do a standard host name to IP address resolution, using
-			the system <TT
+Do a standard host name to IP address resolution, using
+the system <TT
 CLASS="FILENAME"
 >/etc/hosts</TT
 >, NIS, or DNS
-			lookups. This method of name resolution is operating 
-			system dependent, for instance on IRIX or Solaris this 
-			may be controlled by the <TT
+lookups. This method of name resolution is operating 
+system dependent, for instance on IRIX or Solaris this 
+may be controlled by the <TT
 CLASS="FILENAME"
->/etc/nsswitch.conf
-			</TT
+>/etc/nsswitch.conf</TT
 > file).  Note that this method is only used 
-			if the NetBIOS name type being queried is the 0x20 
-			(server) name type, otherwise it is ignored.
-			</P
+if the NetBIOS name type being queried is the 0x20 
+(server) name type, otherwise it is ignored.</P
 ></LI
 ><LI
 ><P
@@ -190,14 +246,13 @@ CLASS="FILENAME"
 CLASS="CONSTANT"
 >wins</CODE
 >: 
-			Query a name with the IP address listed in the 
-			<VAR
+Query a name with the IP address listed in the 
+<VAR
 CLASS="PARAMETER"
 >wins server</VAR
 > parameter.  If no 
-			WINS server has been specified this method will be 
-			ignored.
-			</P
+WINS server has been specified this method will be 
+ignored.</P
 ></LI
 ><LI
 ><P
@@ -205,36 +260,34 @@ CLASS="PARAMETER"
 CLASS="CONSTANT"
 >bcast</CODE
 >: 
-			Do a broadcast on each of the known local interfaces 
-			listed in the <VAR
+Do a broadcast on each of the known local interfaces 
+listed in the <VAR
 CLASS="PARAMETER"
 >interfaces</VAR
 >
-			parameter. This is the least reliable of the name 
-			resolution methods as it depends on the target host 
-			being on a locally connected subnet.
-			</P
+parameter. This is the least reliable of the name 
+resolution methods as it depends on the target host 
+being on a locally connected subnet.</P
 ></LI
 ></UL
 ><P
 >If this parameter is not set then the name resolve order 
-		defined in the <SPAN
+defined in the <SPAN
 CLASS="CITEREFENTRY"
 ><SPAN
 CLASS="REFENTRYTITLE"
 >smb.conf</SPAN
 >(5)</SPAN
 > file parameter  
-		(<VAR
+(<VAR
 CLASS="PARAMETER"
 >name resolve order</VAR
 >) will be used. </P
 ><P
 >The default order is lmhosts, host, wins, bcast. Without 
-		this parameter or any entry in the <VAR
+this parameter or any entry in the <VAR
 CLASS="PARAMETER"
->name resolve order
-		</VAR
+>name resolve order</VAR
 > parameter of the <SPAN
 CLASS="CITEREFENTRY"
 ><SPAN
@@ -242,43 +295,7 @@ CLASS="REFENTRYTITLE"
 >smb.conf</SPAN
 >(5)</SPAN
 > file, the name resolution methods 
-		will be attempted in this order. </P
-></DD
-><DT
->-d &#60;debug level&#62;</DT
-><DD
-><P
->debug level is an integer from 0 to 10.</P
-><P
->The default value if this parameter is not specified
-		is zero.</P
-><P
->The higher this value, the more detail will be logged
-		about the activities of <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->nmblookup</SPAN
->(1)</SPAN
->. At level
-		0, only critical errors and serious warnings will be logged.
-		</P
-></DD
-><DT
->-l logfilename</DT
-><DD
-><P
->If specified causes all debug messages to be
-		written to the file specified by <VAR
-CLASS="REPLACEABLE"
->logfilename
-		</VAR
->. If not specified then all messages will be 
-		written to<VAR
-CLASS="REPLACEABLE"
->stderr</VAR
->.
-		</P
+will be attempted in this order. </P
 ></DD
 ><DT
 >-L libdir</DT
@@ -298,7 +315,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN104"
+NAME="AEN106"
 ></A
 ><H2
 >EXAMPLES</H2
@@ -371,7 +388,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN124"
+NAME="AEN126"
 ></A
 ><H2
 >VERSION</H2
@@ -381,7 +398,7 @@ NAME="AEN124"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN127"
+NAME="AEN129"
 ></A
 ><H2
 >BUGS</H2
@@ -414,7 +431,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN136"
+NAME="AEN138"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -436,7 +453,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN145"
+NAME="AEN147"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbspool.8.html b/docs/htmldocs/smbspool.8.html
index ca9641a72e..fb2c8b25e0 100644
--- a/docs/htmldocs/smbspool.8.html
+++ b/docs/htmldocs/smbspool.8.html
@@ -37,7 +37,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbspool</B
->  [job] [user] [title] [copies] [options] [filename]</P
+>  {job} {user} {title} {copies} {options} [filename]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -167,7 +167,7 @@ NAME="AEN56"
 ><H2
 >VERSION</H2
 ><P
->This man page is correct for version 2.2 of the Samba suite.</P
+>This man page is correct for version 3.0 of the Samba suite.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
diff --git a/docs/htmldocs/smbstatus.1.html b/docs/htmldocs/smbstatus.1.html
index 973fb5bb87..23b82759ea 100644
--- a/docs/htmldocs/smbstatus.1.html
+++ b/docs/htmldocs/smbstatus.1.html
@@ -88,10 +88,84 @@ CLASS="VARIABLELIST"
 >gives brief output.</P
 ></DD
 ><DT
->-d|--debug=&#60;debuglevel&#62;</DT
+>-V</DT
 ><DD
 ><P
->sets debugging to specified level</P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
+>-d|--debug=debuglevel</DT
+><DD
+><P
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
+></DD
+><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ><DT
 >-v|--verbose</DT
@@ -132,18 +206,10 @@ CLASS="REFENTRYTITLE"
 >causes smbstatus to only list shares.</P
 ></DD
 ><DT
->-s|--conf=&#60;configuration file&#62;</DT
+>-h|--help</DT
 ><DD
 ><P
->The default configuration file name is
-		determined at compile time. The file specified contains the
-		configuration details required by the server. See <SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> for more information.</P
+>Print a summary of command line options.</P
 ></DD
 ><DT
 >-u|--user=&#60;username&#62;</DT
@@ -161,7 +227,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN79"
+NAME="AEN99"
 ></A
 ><H2
 >VERSION</H2
@@ -172,7 +238,7 @@ NAME="AEN79"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82"
+NAME="AEN102"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -194,7 +260,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91"
+NAME="AEN111"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbtar.1.html b/docs/htmldocs/smbtar.1.html
index fe405a0d84..87026c35b5 100644
--- a/docs/htmldocs/smbtar.1.html
+++ b/docs/htmldocs/smbtar.1.html
@@ -38,7 +38,7 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbtar</B
->  {-s server} [-p password] [-x services] [-X] [-d directory] [-u user] [-t tape] [-t tape] [-b blocksize] [-N filename] [-i] [-r] [-l loglevel] [-v] {filenames}</P
+>  [-r] [-i] [-a] [-v] {-s server} [-p password] [-x services] [-X] [-N filename] [-b blocksize] [-d directory] [-l loglevel] [-u user] [-t tape] {filenames}</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -132,6 +132,13 @@ CLASS="PARAMETER"
 		UNIX login name. </P
 ></DD
 ><DT
+>-a</DT
+><DD
+><P
+>Reset DOS archive bit mode to 
+		indicate file has been archived. </P
+></DD
+><DT
 >-t tape</DT
 ><DD
 ><P
@@ -201,7 +208,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN100"
+NAME="AEN104"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -216,7 +223,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN104"
+NAME="AEN108"
 ></A
 ><H2
 >BUGS</H2
@@ -230,7 +237,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN108"
+NAME="AEN112"
 ></A
 ><H2
 >CAVEATS</H2
@@ -243,7 +250,7 @@ NAME="AEN108"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN111"
+NAME="AEN115"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -265,7 +272,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN118"
+NAME="AEN122"
 ></A
 ><H2
 >VERSION</H2
@@ -276,7 +283,7 @@ NAME="AEN118"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN121"
+NAME="AEN125"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -304,7 +311,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN133"
+NAME="AEN137"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/speed.html b/docs/htmldocs/speed.html
index dda491e4f6..0f886772fc 100644
--- a/docs/htmldocs/speed.html
+++ b/docs/htmldocs/speed.html
@@ -13,8 +13,8 @@ REL="UP"
 TITLE="Appendixes"
 HREF="appendixes.html"><LINK
 REL="PREVIOUS"
-TITLE="Appendixes"
-HREF="appendixes.html"><LINK
+TITLE="Migration from NT4 PDC to Samba-3 PDC"
+HREF="nt4migration.html"><LINK
 REL="NEXT"
 TITLE="Portability"
 HREF="portability.html"></HEAD
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="appendixes.html"
+HREF="nt4migration.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="SPEED"
 ></A
->Chapter 23. Samba performance issues</H1
+>Chapter 27. Samba performance issues</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3443"
->23.1. Comparisons</A
+NAME="AEN4041"
+>27.1. Comparisons</A
 ></H1
 ><P
 >The Samba server uses TCP to talk to the client. Thus if you are
@@ -111,8 +111,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3449"
->23.2. Socket options</A
+NAME="AEN4047"
+>27.2. Socket options</A
 ></H1
 ><P
 >There are a number of socket options that can greatly affect the
@@ -139,8 +139,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3456"
->23.3. Read size</A
+NAME="AEN4054"
+>27.3. Read size</A
 ></H1
 ><P
 >The option "read size" affects the overlap of disk reads/writes with
@@ -165,8 +165,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3461"
->23.4. Max xmit</A
+NAME="AEN4059"
+>27.4. Max xmit</A
 ></H1
 ><P
 >At startup the client and server negotiate a "maximum transmit" size,
@@ -188,8 +188,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3466"
->23.5. Log level</A
+NAME="AEN4064"
+>27.5. Log level</A
 ></H1
 ><P
 >If you set the log level (also known as "debug level") higher than 2
@@ -202,8 +202,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3469"
->23.6. Read raw</A
+NAME="AEN4067"
+>27.6. Read raw</A
 ></H1
 ><P
 >The "read raw" operation is designed to be an optimised, low-latency
@@ -224,8 +224,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3474"
->23.7. Write raw</A
+NAME="AEN4072"
+>27.7. Write raw</A
 ></H1
 ><P
 >The "write raw" operation is designed to be an optimised, low-latency
@@ -241,8 +241,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3478"
->23.8. Slow Clients</A
+NAME="AEN4076"
+>27.8. Slow Clients</A
 ></H1
 ><P
 >One person has reported that setting the protocol to COREPLUS rather
@@ -258,8 +258,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3482"
->23.9. Slow Logins</A
+NAME="AEN4080"
+>27.9. Slow Logins</A
 ></H1
 ><P
 >Slow logins are almost always due to the password checking time. Using
@@ -271,8 +271,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3485"
->23.10. Client tuning</A
+NAME="AEN4083"
+>27.10. Client tuning</A
 ></H1
 ><P
 >Often a speed problem can be traced to the client. The client (for
@@ -389,7 +389,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="appendixes.html"
+HREF="nt4migration.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -417,7 +417,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Appendixes</TD
+>Migration from NT4 PDC to Samba-3 PDC</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/swat.8.html b/docs/htmldocs/swat.8.html
index d78fee1960..2abd049b71 100644
--- a/docs/htmldocs/swat.8.html
+++ b/docs/htmldocs/swat.8.html
@@ -145,17 +145,109 @@ CLASS="EMPHASIS"
 ></SPAN
 ></P
 ></DD
+><DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
+>-d|--debug=debuglevel</DT
+><DD
+><P
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
+></DD
+><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49"
+NAME="AEN80"
 ></A
 ><H2
 >INSTALLATION</H2
 ><P
+>Swat is included as binary package with most distributions. The 
+	package manager in this case takes care of the installation and 
+	configuration. This section is only for those who have compiled 
+	swat from scratch.
+	</P
+><P
 >After you compile SWAT you need to run <B
 CLASS="COMMAND"
 >make install
@@ -185,7 +277,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN61"
+NAME="AEN93"
 ></A
 ><H3
 >Inetd Installation</H3
@@ -214,7 +306,7 @@ CLASS="COMMAND"
 >swat            901/tcp</B
 ></P
 ><P
->Note for NIS/YP users - you may need to rebuild the 
+>Note for NIS/YP and LDAP users - you may need to rebuild the 
 		NIS service maps rather than alter your local <TT
 CLASS="FILENAME"
 >		/etc/services</TT
@@ -255,27 +347,27 @@ CLASS="COMMAND"
 		</B
 > where PID is the process ID of the inetd daemon. </P
 ></DIV
+></DIV
 ><DIV
-CLASS="REFSECT2"
+CLASS="REFSECT1"
 ><A
-NAME="AEN83"
+NAME="AEN115"
 ></A
-><H3
->Launching</H3
+><H2
+>LAUNCHING</H2
 ><P
 >To launch SWAT just run your favorite web browser and 
-		point it at "http://localhost:901/".</P
+	point it at "http://localhost:901/".</P
 ><P
 >Note that you can attach to SWAT from any IP connected 
-		machine but connecting from a remote machine leaves your 
-		connection open to password sniffing as passwords will be sent 
-		in the clear over the wire. </P
-></DIV
+	machine but connecting from a remote machine leaves your 
+	connection open to password sniffing as passwords will be sent 
+	in the clear over the wire. </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87"
+NAME="AEN119"
 ></A
 ><H2
 >FILES</H2
@@ -335,7 +427,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN110"
+NAME="AEN142"
 ></A
 ><H2
 >WARNINGS</H2
@@ -365,17 +457,17 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN120"
+NAME="AEN152"
 ></A
 ><H2
 >VERSION</H2
 ><P
->This man page is correct for version 2.2 of the Samba suite.</P
+>This man page is correct for version 3.0 of the Samba suite.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN123"
+NAME="AEN155"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -400,7 +492,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN133"
+NAME="AEN165"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/testparm.1.html b/docs/htmldocs/testparm.1.html
index 3f93b9b241..261f522341 100644
--- a/docs/htmldocs/testparm.1.html
+++ b/docs/htmldocs/testparm.1.html
@@ -126,10 +126,20 @@ CLASS="COMMAND"
 		names and before dumping the service definitions.</P
 ></DD
 ><DT
->-h</DT
+>-h|--help</DT
 ><DD
 ><P
->Print usage message </P
+>Print a summary of command line options.</P
+></DD
+><DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
 ></DD
 ><DT
 >-L servername</DT
@@ -222,7 +232,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN87"
+NAME="AEN92"
 ></A
 ><H2
 >FILES</H2
@@ -257,7 +267,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN100"
+NAME="AEN105"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -271,7 +281,7 @@ NAME="AEN100"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN103"
+NAME="AEN108"
 ></A
 ><H2
 >VERSION</H2
@@ -282,7 +292,7 @@ NAME="AEN103"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN106"
+NAME="AEN111"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -304,7 +314,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN115"
+NAME="AEN120"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/testprns.1.html b/docs/htmldocs/testprns.1.html
index 5efef1fb85..02eea8c57b 100644
--- a/docs/htmldocs/testprns.1.html
+++ b/docs/htmldocs/testprns.1.html
@@ -194,7 +194,7 @@ NAME="AEN60"
 ><H2
 >VERSION</H2
 ><P
->This man page is correct for version 2.2 of 
+>This man page is correct for version 3.0 of 
 	the Samba suite.</P
 ></DIV
 ><DIV
diff --git a/docs/htmldocs/type.html b/docs/htmldocs/type.html
index 1d9806935b..596411e165 100644
--- a/docs/htmldocs/type.html
+++ b/docs/htmldocs/type.html
@@ -78,7 +78,7 @@ CLASS="TITLE"
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN610"
+NAME="AEN674"
 ></A
 ><H1
 >Introduction</H1
@@ -102,24 +102,24 @@ HREF="servertype.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="servertype.html#AEN639"
+HREF="servertype.html#AEN703"
 >Stand Alone Server</A
 ></DT
 ><DT
 >4.2. <A
-HREF="servertype.html#AEN646"
+HREF="servertype.html#AEN710"
 >Domain Member Server</A
 ></DT
 ><DT
 >4.3. <A
-HREF="servertype.html#AEN652"
+HREF="servertype.html#AEN716"
 >Domain Controller</A
 ></DT
 ><DD
 ><DL
 ><DT
 >4.3.1. <A
-HREF="servertype.html#AEN655"
+HREF="servertype.html#AEN719"
 >Domain Controller Types</A
 ></DT
 ></DL
@@ -135,34 +135,34 @@ HREF="securitylevels.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="securitylevels.html#AEN681"
+HREF="securitylevels.html#AEN752"
 >User and Share security level</A
 ></DT
 ><DD
 ><DL
 ><DT
 >5.1.1. <A
-HREF="securitylevels.html#AEN684"
+HREF="securitylevels.html#AEN755"
 >User Level Security</A
 ></DT
 ><DT
 >5.1.2. <A
-HREF="securitylevels.html#AEN694"
+HREF="securitylevels.html#AEN765"
 >Share Level Security</A
 ></DT
 ><DT
 >5.1.3. <A
-HREF="securitylevels.html#AEN698"
+HREF="securitylevels.html#AEN769"
 >Server Level Security</A
 ></DT
 ><DT
 >5.1.4. <A
-HREF="securitylevels.html#AEN737"
+HREF="securitylevels.html#AEN808"
 >Domain Level Security</A
 ></DT
 ><DT
 >5.1.5. <A
-HREF="securitylevels.html#AEN758"
+HREF="securitylevels.html#AEN829"
 >ADS Level Security</A
 ></DT
 ></DL
@@ -178,63 +178,63 @@ HREF="samba-pdc.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="samba-pdc.html#AEN785"
+HREF="samba-pdc.html#AEN859"
 >Prerequisite Reading</A
 ></DT
 ><DT
 >6.2. <A
-HREF="samba-pdc.html#AEN790"
+HREF="samba-pdc.html#AEN864"
 >Background</A
 ></DT
 ><DT
 >6.3. <A
-HREF="samba-pdc.html#AEN830"
+HREF="samba-pdc.html#AEN904"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
 >6.4. <A
-HREF="samba-pdc.html#AEN872"
+HREF="samba-pdc.html#AEN946"
 >Creating Machine Trust Accounts and Joining Clients to the Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.4.1. <A
-HREF="samba-pdc.html#AEN915"
+HREF="samba-pdc.html#AEN989"
 >Manual Creation of Machine Trust Accounts</A
 ></DT
 ><DT
 >6.4.2. <A
-HREF="samba-pdc.html#AEN956"
+HREF="samba-pdc.html#AEN1030"
 >"On-the-Fly" Creation of Machine Trust Accounts</A
 ></DT
 ><DT
 >6.4.3. <A
-HREF="samba-pdc.html#AEN965"
+HREF="samba-pdc.html#AEN1039"
 >Joining the Client to the Domain</A
 ></DT
 ></DL
 ></DD
 ><DT
 >6.5. <A
-HREF="samba-pdc.html#AEN980"
+HREF="samba-pdc.html#AEN1054"
 >Common Problems and Errors</A
 ></DT
 ><DT
 >6.6. <A
-HREF="samba-pdc.html#AEN1026"
+HREF="samba-pdc.html#AEN1100"
 >What other help can I get?</A
 ></DT
 ><DT
 >6.7. <A
-HREF="samba-pdc.html#AEN1140"
+HREF="samba-pdc.html#AEN1214"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.7.1. <A
-HREF="samba-pdc.html#AEN1163"
+HREF="samba-pdc.html#AEN1237"
 >Configuration Instructions:	Network Logons</A
 ></DT
 ></DL
@@ -250,53 +250,53 @@ HREF="samba-bdc.html"
 ><DL
 ><DT
 >7.1. <A
-HREF="samba-bdc.html#AEN1193"
+HREF="samba-bdc.html#AEN1267"
 >Prerequisite Reading</A
 ></DT
 ><DT
 >7.2. <A
-HREF="samba-bdc.html#AEN1197"
+HREF="samba-bdc.html#AEN1271"
 >Background</A
 ></DT
 ><DT
 >7.3. <A
-HREF="samba-bdc.html#AEN1205"
+HREF="samba-bdc.html#AEN1279"
 >What qualifies a Domain Controller on the network?</A
 ></DT
 ><DD
 ><DL
 ><DT
 >7.3.1. <A
-HREF="samba-bdc.html#AEN1208"
+HREF="samba-bdc.html#AEN1282"
 >How does a Workstation find its domain controller?</A
 ></DT
 ><DT
 >7.3.2. <A
-HREF="samba-bdc.html#AEN1211"
+HREF="samba-bdc.html#AEN1285"
 >When is the PDC needed?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >7.4. <A
-HREF="samba-bdc.html#AEN1214"
+HREF="samba-bdc.html#AEN1288"
 >Can Samba be a Backup Domain Controller to an NT PDC?</A
 ></DT
 ><DT
 >7.5. <A
-HREF="samba-bdc.html#AEN1219"
+HREF="samba-bdc.html#AEN1293"
 >How do I set up a Samba BDC?</A
 ></DT
 ><DD
 ><DL
 ><DT
 >7.5.1. <A
-HREF="samba-bdc.html#AEN1236"
+HREF="samba-bdc.html#AEN1310"
 >How do I replicate the smbpasswd file?</A
 ></DT
 ><DT
 >7.5.2. <A
-HREF="samba-bdc.html#AEN1240"
+HREF="samba-bdc.html#AEN1314"
 >Can I do this all with LDAP?</A
 ></DT
 ></DL
@@ -312,7 +312,7 @@ HREF="ads.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="ads.html#AEN1251"
+HREF="ads.html#AEN1336"
 >Setup your <TT
 CLASS="FILENAME"
 >smb.conf</TT
@@ -320,7 +320,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >8.2. <A
-HREF="ads.html#AEN1262"
+HREF="ads.html#AEN1349"
 >Setup your <TT
 CLASS="FILENAME"
 >/etc/krb5.conf</TT
@@ -328,31 +328,31 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >8.3. <A
-HREF="ads.html#AEN1273"
+HREF="ads.html#ADS-CREATE-MACHINE-ACCOUNT"
 >Create the computer account</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.3.1. <A
-HREF="ads.html#AEN1277"
+HREF="ads.html#AEN1373"
 >Possible errors</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.4. <A
-HREF="ads.html#AEN1285"
+HREF="ads.html#ADS-TEST-SERVER"
 >Test your server setup</A
 ></DT
 ><DT
 >8.5. <A
-HREF="ads.html#AEN1290"
+HREF="ads.html#ADS-TEST-SMBCLIENT"
 >Testing with smbclient</A
 ></DT
 ><DT
 >8.6. <A
-HREF="ads.html#AEN1293"
+HREF="ads.html#AEN1390"
 >Notes</A
 ></DT
 ></DL
@@ -366,12 +366,12 @@ HREF="domain-security.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="domain-security.html#AEN1315"
+HREF="domain-security.html#AEN1413"
 >Joining an NT Domain with Samba 3.0</A
 ></DT
 ><DT
 >9.2. <A
-HREF="domain-security.html#AEN1369"
+HREF="domain-security.html#AEN1467"
 >Why is this better than security = server?</A
 ></DT
 ></DL
diff --git a/docs/htmldocs/unix-permissions.html b/docs/htmldocs/unix-permissions.html
index 02c0b62240..7c827a16cf 100644
--- a/docs/htmldocs/unix-permissions.html
+++ b/docs/htmldocs/unix-permissions.html
@@ -13,10 +13,10 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="System Policies"
-HREF="advancednetworkmanagement.html"><LINK
+TITLE="Advanced Configuration"
+HREF="optional.html"><LINK
 REL="NEXT"
-TITLE="Group mapping HOWTO"
+TITLE="Configuring Group Mapping"
 HREF="groupmapping.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="advancednetworkmanagement.html"
+HREF="optional.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -74,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="UNIX-PERMISSIONS"
 ></A
->Chapter 11. UNIX Permission Bits and Windows NT Access Control Lists</H1
+>Chapter 10. UNIX Permission Bits and Windows NT Access Control Lists</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1663"
->11.1. Viewing and changing UNIX permissions using the NT 
+NAME="AEN1499"
+>10.1. Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></H1
 ><P
@@ -92,14 +92,46 @@ NAME="AEN1663"
 	the security of the UNIX host Samba is running on, and 
 	still obeys all the file permission rules that a Samba 
 	administrator can set.</P
+><DIV
+CLASS="NOTE"
+><P
+></P
+><TABLE
+CLASS="NOTE"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>	All access to Unix/Linux system file via Samba is controlled at
+	the operating system file access control level. When trying to
+	figure out file access problems it is vitally important to identify
+	the identity of the Windows user as it is presented by Samba at
+	the point of file access. This can best be determined from the
+	Samba log files.
+	</P
+></TD
+></TR
+></TABLE
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1667"
->11.2. How to view file security on a Samba share</A
+NAME="AEN1505"
+>10.2. How to view file security on a Samba share</A
 ></H1
 ><P
 >From an NT4/2000/XP client, single-click with the right 
@@ -167,8 +199,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1678"
->11.3. Viewing file ownership</A
+NAME="AEN1516"
+>10.3. Viewing file ownership</A
 ></H1
 ><P
 >Clicking on the <B
@@ -253,8 +285,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1698"
->11.4. Viewing file or directory permissions</A
+NAME="AEN1536"
+>10.4. Viewing file or directory permissions</A
 ></H1
 ><P
 >The third button is the <B
@@ -307,8 +339,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1713"
->11.4.1. File Permissions</A
+NAME="AEN1551"
+>10.4.1. File Permissions</A
 ></H2
 ><P
 >The standard UNIX user/group/world triple and 
@@ -369,8 +401,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1727"
->11.4.2. Directory Permissions</A
+NAME="AEN1565"
+>10.4.2. Directory Permissions</A
 ></H2
 ><P
 >Directories on an NT NTFS file system have two 
@@ -401,8 +433,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1734"
->11.5. Modifying file or directory permissions</A
+NAME="AEN1572"
+>10.5. Modifying file or directory permissions</A
 ></H1
 ><P
 >Modifying file and directory permissions is as simple 
@@ -497,8 +529,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1756"
->11.6. Interaction with the standard Samba create mask 
+NAME="AEN1594"
+>10.6. Interaction with the standard Samba create mask 
 	parameters</A
 ></H1
 ><P
@@ -691,8 +723,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1810"
->11.7. Interaction with the standard Samba file attribute 
+NAME="AEN1648"
+>10.7. Interaction with the standard Samba file attribute 
 	mapping</A
 ></H1
 ><P
@@ -750,7 +782,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="advancednetworkmanagement.html"
+HREF="optional.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -778,7 +810,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->System Policies</TD
+>Advanced Configuration</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -792,7 +824,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Group mapping HOWTO</TD
+>Configuring Group Mapping</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/vfs.html b/docs/htmldocs/vfs.html
index c735eead1c..13e75c59cf 100644
--- a/docs/htmldocs/vfs.html
+++ b/docs/htmldocs/vfs.html
@@ -13,11 +13,11 @@ REL="UP"
 TITLE="Advanced Configuration"
 HREF="optional.html"><LINK
 REL="PREVIOUS"
-TITLE="Hosting a Microsoft Distributed File System tree on Samba"
-HREF="msdfs.html"><LINK
+TITLE="PAM Configuration for Centrally Managed Authentication"
+HREF="pam.html"><LINK
 REL="NEXT"
-TITLE="Securing Samba"
-HREF="securing-samba.html"></HEAD
+TITLE="Hosting a Microsoft Distributed File System tree on Samba"
+HREF="msdfs.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -45,7 +45,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="msdfs.html"
+HREF="pam.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="securing-samba.html"
+HREF="msdfs.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="VFS"
 ></A
->Chapter 20. Stackable VFS modules</H1
+>Chapter 19. Stackable VFS modules</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3259"
->20.1. Introduction and configuration</A
+NAME="AEN3423"
+>19.1. Introduction and configuration</A
 ></H1
 ><P
 >Since samba 3.0, samba supports stackable VFS(Virtual File System) modules.  
@@ -121,16 +121,16 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3268"
->20.2. Included modules</A
+NAME="AEN3432"
+>19.2. Included modules</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3270"
->20.2.1. audit</A
+NAME="AEN3434"
+>19.2.1. audit</A
 ></H2
 ><P
 >A simple module to audit file access to the syslog
@@ -167,8 +167,30 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3278"
->20.2.2. recycle</A
+NAME="AEN3442"
+>19.2.2. extd_audit</A
+></H2
+><P
+>This module is identical with the <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>audit</I
+></SPAN
+> module above except
+that it sends audit logs to both syslog as well as the smbd log file/s. The 
+loglevel for this module is set in the smb.conf file. At loglevel = 0, only file
+and directory deletions and directory and file creations are logged. At loglevel = 1
+file opens are renames and permission changes are logged , while at loglevel = 2 file
+open and close calls are logged also.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN3446"
+>19.2.3. recycle</A
 ></H2
 ><P
 >A recycle-bin like modules. When used any unlink call
@@ -238,8 +260,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3315"
->20.2.3. netatalk</A
+NAME="AEN3483"
+>19.2.4. netatalk</A
 ></H2
 ><P
 >A netatalk module, that will ease co-existence of samba and
@@ -271,8 +293,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3322"
->20.3. VFS modules available elsewhere</A
+NAME="AEN3490"
+>19.3. VFS modules available elsewhere</A
 ></H1
 ><P
 >This section contains a listing of various other VFS modules that 
@@ -287,8 +309,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3326"
->20.3.1. DatabaseFS</A
+NAME="AEN3494"
+>19.3.1. DatabaseFS</A
 ></H2
 ><P
 >URL: <A
@@ -321,8 +343,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3334"
->20.3.2. vscan</A
+NAME="AEN3502"
+>19.3.2. vscan</A
 ></H2
 ><P
 >URL: <A
@@ -355,7 +377,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="msdfs.html"
+HREF="pam.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -373,7 +395,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="securing-samba.html"
+HREF="msdfs.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -383,7 +405,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Hosting a Microsoft Distributed File System tree on Samba</TD
+>PAM Configuration for Centrally Managed Authentication</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -397,7 +419,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Securing Samba</TD
+>Hosting a Microsoft Distributed File System tree on Samba</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/vfstest.1.html b/docs/htmldocs/vfstest.1.html
index ff6310fd3e..229f132ca8 100644
--- a/docs/htmldocs/vfstest.1.html
+++ b/docs/htmldocs/vfstest.1.html
@@ -85,6 +85,54 @@ CLASS="VARIABLELIST"
 		</P
 ></DD
 ><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
+><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+		<CODE
+CLASS="CONSTANT"
+>'.client'</CODE
+> will be appended. The log file is never removed
+		by the client.
+		</P
+></DD
+><DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
 >-d|--debug=debuglevel</DT
 ><DD
 ><P
@@ -124,22 +172,15 @@ CLASS="FILENAME"
 > file.</P
 ></DD
 ><DT
->-h|--help</DT
-><DD
-><P
->Print a summary of command line options.</P
-></DD
-><DT
 >-l|--logfile=logbasename</DT
 ><DD
 ><P
 >File name for log/debug files. The extension
-		<CODE
+<CODE
 CLASS="CONSTANT"
->'.client'</CODE
-> will be appended. The log file is never removed
-		by the client.
-		</P
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
 ></DD
 ></DL
 ></DIV
@@ -147,7 +188,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN50"
+NAME="AEN66"
 ></A
 ><H2
 >COMMANDS</H2
@@ -468,7 +509,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN181"
+NAME="AEN197"
 ></A
 ><H2
 >VERSION</H2
@@ -479,7 +520,7 @@ NAME="AEN181"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN184"
+NAME="AEN200"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index 9c87282ac1..9833239078 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >wbinfo</B
->  [-u] [-g] [-i ip] [-N netbios-name] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-r user] [-a user%password] [-A user%password] [-p]</P
+>  [-u] [-g] [-N netbios-name] [-I ip] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [--sequence] [-r user] [-a user%password] [-A user%password] [--get-auth-user] [-p]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27"
+NAME="AEN29"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -83,7 +83,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN43"
+NAME="AEN45"
 ></A
 ><H2
 >OPTIONS</H2
@@ -295,6 +295,13 @@ CLASS="REFENTRYTITLE"
 		</P
 ></DD
 ><DT
+>--sequence</DT
+><DD
+><P
+>Show sequence numbers of 
+		all known domains</P
+></DD
+><DT
 >-r username</DT
 ><DD
 ><P
@@ -322,13 +329,46 @@ CLASS="REFENTRYTITLE"
 		Windows 2000 servers only).
 		</P
 ></DD
+><DT
+>--get-auth-user</DT
+><DD
+><P
+>Print username and password used by winbindd
+		during session setup to a domain controller. Username 
+		and password can be set using '-A'. Only available for 
+		root.</P
+></DD
+><DT
+>-p</DT
+><DD
+><P
+>Check whether winbindd is still alive. 
+		Prints out either 'succeeded' or 'failed'.
+		</P
+></DD
+><DT
+>-V</DT
+><DD
+><P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
+></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN147"
+NAME="AEN170"
 ></A
 ><H2
 >EXIT STATUS</H2
@@ -349,7 +389,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN154"
+NAME="AEN177"
 ></A
 ><H2
 >VERSION</H2
@@ -360,7 +400,7 @@ NAME="AEN154"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN157"
+NAME="AEN180"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -376,7 +416,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN163"
+NAME="AEN186"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index ccd5e54ff9..f7703f8f53 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -16,8 +16,8 @@ REL="PREVIOUS"
 TITLE="CUPS Printing Support"
 HREF="cups-printing.html"><LINK
 REL="NEXT"
-TITLE="Integrating MS Windows networks with Samba"
-HREF="integrate-ms-networks.html"></HEAD
+TITLE="Advanced Network Manangement"
+HREF="advancednetworkmanagement.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +59,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="integrate-ms-networks.html"
+HREF="advancednetworkmanagement.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,14 +74,14 @@ CLASS="CHAPTER"
 ><A
 NAME="WINBIND"
 ></A
->Chapter 16. Unified Logons between Windows NT and UNIX using Winbind</H1
+>Chapter 14. Unified Logons between Windows NT and UNIX using Winbind</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2573"
->16.1. Abstract</A
+NAME="AEN2469"
+>14.1. Abstract</A
 ></H1
 ><P
 >Integration of UNIX and Microsoft Windows NT through 
@@ -107,8 +107,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2577"
->16.2. Introduction</A
+NAME="AEN2473"
+>14.2. Introduction</A
 ></H1
 ><P
 >It is well known that UNIX and Microsoft Windows NT have 
@@ -161,8 +161,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2590"
->16.3. What Winbind Provides</A
+NAME="AEN2486"
+>14.3. What Winbind Provides</A
 ></H1
 ><P
 >Winbind unifies UNIX and Windows NT account management by 
@@ -203,8 +203,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2597"
->16.3.1. Target Uses</A
+NAME="AEN2493"
+>14.3.1. Target Uses</A
 ></H2
 ><P
 >Winbind is targeted at organizations that have an 
@@ -227,8 +227,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2601"
->16.4. How Winbind Works</A
+NAME="AEN2497"
+>14.4. How Winbind Works</A
 ></H1
 ><P
 >The winbind system is designed around a client/server 
@@ -247,8 +247,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2606"
->16.4.1. Microsoft Remote Procedure Calls</A
+NAME="AEN2502"
+>14.4.1. Microsoft Remote Procedure Calls</A
 ></H2
 ><P
 >Over the last few years, efforts have been underway 
@@ -273,8 +273,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2610"
->16.4.2. Microsoft Active Directory Services</A
+NAME="AEN2506"
+>14.4.2. Microsoft Active Directory Services</A
 ></H2
 ><P
 >                Since late 2001, Samba has gained the ability to
@@ -292,8 +292,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2613"
->16.4.3. Name Service Switch</A
+NAME="AEN2509"
+>14.4.3. Name Service Switch</A
 ></H2
 ><P
 >The Name Service Switch, or NSS, is a feature that is 
@@ -372,8 +372,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2629"
->16.4.4. Pluggable Authentication Modules</A
+NAME="AEN2525"
+>14.4.4. Pluggable Authentication Modules</A
 ></H2
 ><P
 >Pluggable Authentication Modules, also known as PAM, 
@@ -421,8 +421,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2637"
->16.4.5. User and Group ID Allocation</A
+NAME="AEN2533"
+>14.4.5. User and Group ID Allocation</A
 ></H2
 ><P
 >When a user or group is created under Windows NT 
@@ -447,8 +447,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2641"
->16.4.6. Result Caching</A
+NAME="AEN2537"
+>14.4.6. Result Caching</A
 ></H2
 ><P
 >An active system can generate a lot of user and group 
@@ -470,8 +470,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2644"
->16.5. Installation and Configuration</A
+NAME="AEN2540"
+>14.5. Installation and Configuration</A
 ></H1
 ><P
 >Many thanks to John Trostel <A
@@ -489,8 +489,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2649"
->16.5.1. Introduction</A
+NAME="AEN2545"
+>14.5.1. Introduction</A
 ></H2
 ><P
 >This HOWTO describes the procedures used to get winbind up and 
@@ -548,8 +548,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2662"
->16.5.2. Requirements</A
+NAME="AEN2558"
+>14.5.2. Requirements</A
 ></H2
 ><P
 >If you have a samba configuration file that you are currently 
@@ -618,8 +618,8 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2676"
->16.5.3. Testing Things Out</A
+NAME="AEN2572"
+>14.5.3. Testing Things Out</A
 ></H2
 ><P
 >Before starting, it is probably best to kill off all the SAMBA 
@@ -663,8 +663,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2687"
->16.5.3.1. Configure and compile SAMBA</A
+NAME="AEN2583"
+>14.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
 >The configuration and compilation of SAMBA is pretty straightforward.
@@ -729,8 +729,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2706"
->16.5.3.2. Configure <TT
+NAME="AEN2602"
+>14.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
 > and the 
@@ -834,8 +834,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2739"
->16.5.3.3. Configure smb.conf</A
+NAME="AEN2635"
+>14.5.3.3. Configure smb.conf</A
 ></H3
 ><P
 >Several parameters are needed in the smb.conf file to control 
@@ -909,8 +909,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2755"
->16.5.3.4. Join the SAMBA server to the PDC domain</A
+NAME="AEN2651"
+>14.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
 >Enter the following command to make the SAMBA server join the 
@@ -947,8 +947,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2766"
->16.5.3.5. Start up the winbindd daemon and test it!</A
+NAME="AEN2662"
+>14.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
 >Eventually, you will want to modify your smb startup script to 
@@ -1083,16 +1083,16 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2806"
->16.5.3.6. Fix the init.d startup scripts</A
+NAME="AEN2702"
+>14.5.3.6. Fix the init.d startup scripts</A
 ></H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2808"
->16.5.3.6.1. Linux</A
+NAME="AEN2704"
+>14.5.3.6.1. Linux</A
 ></H4
 ><P
 >The <B
@@ -1201,8 +1201,8 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2828"
->16.5.3.6.2. Solaris</A
+NAME="AEN2724"
+>14.5.3.6.2. Solaris</A
 ></H4
 ><P
 >On solaris, you need to modify the 
@@ -1285,8 +1285,8 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2838"
->16.5.3.6.3. Restarting</A
+NAME="AEN2734"
+>14.5.3.6.3. Restarting</A
 ></H4
 ><P
 >If you restart the <B
@@ -1309,8 +1309,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2844"
->16.5.3.7. Configure Winbind and PAM</A
+NAME="AEN2740"
+>14.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
 >If you have made it this far, you know that winbindd and samba are working
@@ -1367,8 +1367,8 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2861"
->16.5.3.7.1. Linux/FreeBSD-specific PAM configuration</A
+NAME="AEN2757"
+>14.5.3.7.1. Linux/FreeBSD-specific PAM configuration</A
 ></H4
 ><P
 >The <TT
@@ -1496,8 +1496,8 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2894"
->16.5.3.7.2. Solaris-specific configuration</A
+NAME="AEN2790"
+>14.5.3.7.2. Solaris-specific configuration</A
 ></H4
 ><P
 >The /etc/pam.conf needs to be changed. I changed this file so that my Domain
@@ -1583,8 +1583,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2901"
->16.6. Limitations</A
+NAME="AEN2797"
+>14.6. Limitations</A
 ></H1
 ><P
 >Winbind has a number of limitations in its current 
@@ -1625,8 +1625,8 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2911"
->16.7. Conclusion</A
+NAME="AEN2807"
+>14.7. Conclusion</A
 ></H1
 ><P
 >The winbind system, through the use of the Name Service 
@@ -1671,7 +1671,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="integrate-ms-networks.html"
+HREF="advancednetworkmanagement.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -1695,7 +1695,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Integrating MS Windows networks with Samba</TD
+>Advanced Network Manangement</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/winbindd.8.html b/docs/htmldocs/winbindd.8.html
index b114c40647..df490a054b 100644
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@@ -240,13 +240,90 @@ CLASS="COMMAND"
 		than a file.</P
 ></DD
 ><DT
->-d debuglevel</DT
+>-V</DT
 ><DD
 ><P
->Sets the debuglevel to an integer between 
-		0 and 100. 0 is for no debugging and 100 is for reams and 
-		reams. To submit a bug report to the Samba Team, use debug 
-		level 100 (see BUGS.txt).   </P
+>Prints the version number for 
+<B
+CLASS="COMMAND"
+>smbd</B
+>.</P
+></DD
+><DT
+>-s &#60;configuration file&#62;</DT
+><DD
+><P
+>The file specified contains the 
+configuration details required by the server.  The 
+information in this file includes server-specific
+information such as what printcap file to use, as well 
+as descriptions of all the services that the server is 
+to provide. See <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> for more information.
+The default configuration file name is determined at 
+compile time.</P
+></DD
+><DT
+>-d|--debug=debuglevel</DT
+><DD
+><P
+><VAR
+CLASS="REPLACEABLE"
+>debuglevel</VAR
+> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</P
+><P
+>The higher this value, the more detail will be 
+logged to the log files about the activities of the 
+server. At level 0, only critical errors and serious 
+warnings will be logged. Level 1 is a reasonable level for
+day to day running - it generates a small amount of 
+information about operations carried out.</P
+><P
+>Levels above 1 will generate considerable 
+amounts of log data, and should only be used when 
+investigating a problem. Levels above 3 are designed for 
+use only by developers and generate HUGE amounts of log
+data, most of which is extremely cryptic.</P
+><P
+>Note that specifying this parameter here will 
+override the <A
+HREF="smb.conf.5.html#loglevel"
+TARGET="_top"
+>log
+level</A
+> parameter in the <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+><TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+></A
+> file.</P
+></DD
+><DT
+>-l|--logfile=logbasename</DT
+><DD
+><P
+>File name for log/debug files. The extension
+<CODE
+CLASS="CONSTANT"
+>".client"</CODE
+> will be appended. The log file is
+never removed by the client.</P
+></DD
+><DT
+>-h|--help</DT
+><DD
+><P
+>Print a summary of command line options.</P
 ></DD
 ><DT
 >-i</DT
@@ -292,29 +369,16 @@ CLASS="COMMAND"
 		as 2 threads. The first will answer all requests from the cache, 
 		thus making responses to clients faster. The other will 
 		update the cache for the query that the first has just responded. 
-		Advantage of this is that responses are accurate and fast.
+		Advantage of this is that responses stay accurate and are faster.
 		</P
 ></DD
-><DT
->-s|--conf=smb.conf</DT
-><DD
-><P
->Specifies the location of the all-important
-		<SPAN
-CLASS="CITEREFENTRY"
-><SPAN
-CLASS="REFENTRYTITLE"
->smb.conf</SPAN
->(5)</SPAN
-> file. </P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN106"
+NAME="AEN126"
 ></A
 ><H2
 >NAME AND ID RESOLUTION</H2
@@ -345,7 +409,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN112"
+NAME="AEN132"
 ></A
 ><H2
 >CONFIGURATION</H2
@@ -469,7 +533,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN156"
+NAME="AEN176"
 ></A
 ><H2
 >EXAMPLE SETUP</H2
@@ -524,7 +588,7 @@ CLASS="COMMAND"
 >The next step is to join the domain. To do that use the 
 	<B
 CLASS="COMMAND"
->smbpasswd</B
+>net</B
 > program like this:  </P
 ><P
 ><B
@@ -606,7 +670,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN194"
+NAME="AEN214"
 ></A
 ><H2
 >NOTES</H2
@@ -638,17 +702,6 @@ CLASS="COMMAND"
 > to become aware of new trust relationships between 
 	servers, it must be sent a SIGHUP signal. </P
 ><P
->Client processes resolving names through the <B
-CLASS="COMMAND"
->winbindd</B
->
-	nsswitch module read an environment variable named <VAR
-CLASS="ENVAR"
->	$WINBINDD_DOMAIN</VAR
->.  If this variable contains a comma separated
-	list of Windows NT domain names, then winbindd will only resolve users
-	and groups within those Windows NT domains. </P
-><P
 >PAM is really easy to misconfigure.  Make sure you know what 
 	you are doing when modifying PAM configuration files.  It is possible 
 	to set up PAM such that you can no longer log into your system. </P
@@ -667,7 +720,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN212"
+NAME="AEN229"
 ></A
 ><H2
 >SIGNALS</H2
@@ -721,7 +774,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN231"
+NAME="AEN248"
 ></A
 ><H2
 >FILES</H2
@@ -760,6 +813,34 @@ CLASS="FILENAME"
 		root. </P
 ></DD
 ><DT
+>$LOCKDIR/winbindd_privilaged/pipe</DT
+><DD
+><P
+>The UNIX pipe over which 'privilaged' clients 
+                communicate with the <B
+CLASS="COMMAND"
+>winbindd</B
+> program.  For security 
+                reasons, access to some winbindd functions - like those needed by 
+                the <B
+CLASS="COMMAND"
+>ntlm_auth</B
+> utility - is restricted.  By default,
+                only users in the 'root' group will get this access, however the administrator
+                may change the group permissions on $LOCKDIR/winbindd_privilaged to allow
+                programs like 'squid' to use ntlm_auth.
+		Note that the winbind client will only attempt to connect to the winbindd daemon 
+		if both the <TT
+CLASS="FILENAME"
+>$LOCKDIR/winbindd_privilaged</TT
+> directory
+		and <TT
+CLASS="FILENAME"
+>$LOCKDIR/winbindd_privilaged/pipe</TT
+> file are owned by 
+		root. </P
+></DD
+><DT
 >/lib/libnss_winbind.so.X</DT
 ><DD
 ><P
@@ -795,7 +876,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN260"
+NAME="AEN285"
 ></A
 ><H2
 >VERSION</H2
@@ -806,7 +887,7 @@ NAME="AEN260"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN263"
+NAME="AEN288"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -837,7 +918,7 @@ CLASS="REFENTRYTITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN276"
+NAME="AEN301"
 ></A
 ><H2
 >AUTHOR</H2
-- 
cgit