From a84f1e7535b64dcfb1f274097cf947d0ad6fd1ec Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 16 Jan 2003 02:21:51 +0000
Subject: regenerate docs (This used to be commit
 2215dc37e26bec17eb971e7b54818622a9bb5b97)

---
 docs/htmldocs/ads.html                    |  64 ++--
 docs/htmldocs/appendixes.html             | 167 +++++----
 docs/htmldocs/browsing-quick.html         |  43 +--
 docs/htmldocs/bugreport.html              |  31 +-
 docs/htmldocs/cvs-access.html             |  23 +-
 docs/htmldocs/diagnosis.html              |  67 +---
 docs/htmldocs/domain-security.html        |  19 +-
 docs/htmldocs/findsmb.1.html              |  81 +++--
 docs/htmldocs/groupmapping.html           |   7 +-
 docs/htmldocs/improved-browsing.html      |  65 ++--
 docs/htmldocs/install.html                |  79 ++---
 docs/htmldocs/integrate-ms-networks.html  |  87 ++---
 docs/htmldocs/introduction.html           |  71 ++--
 docs/htmldocs/msdfs.html                  |  15 +-
 docs/htmldocs/optional.html               | 531 +++++++++++++---------------
 docs/htmldocs/other-clients.html          |  59 +---
 docs/htmldocs/pam.html                    |  19 +-
 docs/htmldocs/pdb-mysql.html              |  34 +-
 docs/htmldocs/pdb-xml.html                |  15 +-
 docs/htmldocs/portability.html            |  23 +-
 docs/htmldocs/printing.html               | 101 ++----
 docs/htmldocs/pwencrypt.html              |  29 +-
 docs/htmldocs/samba-bdc.html              |  39 +--
 docs/htmldocs/samba-howto-collection.html | 564 ++++++++++++++----------------
 docs/htmldocs/samba-ldap-howto.html       |  57 +--
 docs/htmldocs/samba-pdc.html              | 115 ++----
 docs/htmldocs/securitylevels.html         |   7 +-
 docs/htmldocs/smb.conf.5.html             | 112 +++++-
 docs/htmldocs/smbd.8.html                 |   2 +-
 docs/htmldocs/speed.html                  | 281 +--------------
 docs/htmldocs/type.html                   | 157 ++++-----
 docs/htmldocs/unix-permissions.html       |  43 +--
 docs/htmldocs/vfs.html                    |  52 +--
 docs/htmldocs/winbind.html                | 119 ++-----
 34 files changed, 1229 insertions(+), 1949 deletions(-)

(limited to 'docs/htmldocs')

diff --git a/docs/htmldocs/ads.html b/docs/htmldocs/ads.html
index 49345be2c0..26ec1d04a7 100644
--- a/docs/htmldocs/ads.html
+++ b/docs/htmldocs/ads.html
@@ -5,7 +5,8 @@
 >Samba as a ADS domain member</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,14 +73,10 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="ADS"
-></A
->Chapter 9. Samba as a ADS domain member</H1
+NAME="ADS">Chapter 8. Samba as a ADS domain member</H1
 ><P
->This is a VERY ROUGH guide to setting up the current (November 2001)
-pre-alpha version of Samba 3.0 with kerberos authentication against a
-Windows2000 KDC. The procedures listed here are likely to change as
-the code develops.</P
+>This is a rough guide to setting up Samba 3.0 with kerberos authentication against a
+Windows2000 KDC. </P
 ><P
 >Pieces you need before you begin:
 <P
@@ -113,9 +110,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1203"
-></A
->9.1. Installing the required packages for Debian</H1
+NAME="AEN1187">8.1. Installing the required packages for Debian</H1
 ><P
 >On Debian you need to install the following packages:
 <P
@@ -142,9 +137,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1209"
-></A
->9.2. Installing the required packages for RedHat</H1
+NAME="AEN1193">8.2. Installing the required packages for RedHat</H1
 ><P
 >On RedHat this means you should have at least: 
 <P
@@ -180,9 +173,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1218"
-></A
->9.3. Compile Samba</H1
+NAME="AEN1202">8.3. Compile Samba</H1
 ><P
 >If your kerberos libraries are in a non-standard location then
   remember to add the configure option --with-krb5=DIR.</P
@@ -206,13 +197,22 @@ CLASS="PROGRAMLISTING"
 ><PRE
 CLASS="PROGRAMLISTING"
 >  realm = YOUR.KERBEROS.REALM
-  ads server = your.kerberos.server
   security = ADS
   encrypt passwords = yes</PRE
 ></P
 ><P
->Strictly speaking, you can omit the realm name and you can use an IP
-  address for the ads server. In that case Samba will auto-detect these.</P
+>In case samba can't figure out your ads server using your realm name, use the 
+<B
+CLASS="COMMAND"
+>ads server</B
+> option in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>:
+<PRE
+CLASS="PROGRAMLISTING"
+>  ads server = your.kerberos.server</PRE
+></P
 ><P
 >You do *not* need a smbpasswd file, although it won't do any harm
   and if you have one then Samba will be able to fall back to normal
@@ -225,9 +225,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1230"
-></A
->9.4. Setup your /etc/krb5.conf</H1
+NAME="AEN1217">8.4. Setup your /etc/krb5.conf</H1
 ><P
 >The minimal configuration for krb5.conf is:</P
 ><P
@@ -264,9 +262,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1240"
-></A
->9.5. Create the computer account</H1
+NAME="AEN1227">8.5. Create the computer account</H1
 ><P
 >Do a "kinit" as a user that has authority to change arbitrary
 passwords on the KDC ("Administrator" is a good choice). Then as a
@@ -281,9 +277,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1244"
-></A
->9.5.1. Possible errors</H2
+NAME="AEN1231">8.5.1. Possible errors</H2
 ><P
 ><P
 ></P
@@ -312,9 +306,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1256"
-></A
->9.6. Test your server setup</H1
+NAME="AEN1243">8.6. Test your server setup</H1
 ><P
 >On a Windows 2000 client try <B
 CLASS="COMMAND"
@@ -332,9 +324,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1261"
-></A
->9.7. Testing with smbclient</H1
+NAME="AEN1248">8.7. Testing with smbclient</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
@@ -345,9 +335,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1264"
-></A
->9.8. Notes</H1
+NAME="AEN1251">8.8. Notes</H1
 ><P
 >You must change administrator password at least once after DC install,
  to create the right encoding types</P
diff --git a/docs/htmldocs/appendixes.html b/docs/htmldocs/appendixes.html
index 49242c6554..e7eefcb441 100644
--- a/docs/htmldocs/appendixes.html
+++ b/docs/htmldocs/appendixes.html
@@ -5,7 +5,8 @@
 >Appendixes</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -68,9 +69,7 @@ WIDTH="100%"></DIV
 ><DIV
 CLASS="PART"
 ><A
-NAME="APPENDIXES"
-></A
-><DIV
+NAME="APPENDIXES"><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
@@ -83,243 +82,243 @@ CLASS="TOC"
 >Table of Contents</B
 ></DT
 ><DT
->24. <A
+>23. <A
 HREF="portability.html"
 >Portability</A
 ></DT
 ><DD
 ><DL
 ><DT
->24.1. <A
-HREF="portability.html#AEN3198"
+>23.1. <A
+HREF="portability.html#AEN3139"
 >HPUX</A
 ></DT
 ><DT
->24.2. <A
-HREF="portability.html#AEN3204"
+>23.2. <A
+HREF="portability.html#AEN3145"
 >SCO Unix</A
 ></DT
 ><DT
->24.3. <A
-HREF="portability.html#AEN3208"
+>23.3. <A
+HREF="portability.html#AEN3149"
 >DNIX</A
 ></DT
 ><DT
->24.4. <A
-HREF="portability.html#AEN3237"
+>23.4. <A
+HREF="portability.html#AEN3178"
 >RedHat Linux Rembrandt-II</A
 ></DT
 ></DL
 ></DD
 ><DT
->25. <A
+>24. <A
 HREF="other-clients.html"
 >Samba and other CIFS clients</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.1. <A
-HREF="other-clients.html#AEN3258"
+>24.1. <A
+HREF="other-clients.html#AEN3199"
 >Macintosh clients?</A
 ></DT
 ><DT
->25.2. <A
-HREF="other-clients.html#AEN3267"
+>24.2. <A
+HREF="other-clients.html#AEN3208"
 >OS2 Client</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.2.1. <A
-HREF="other-clients.html#AEN3269"
+>24.2.1. <A
+HREF="other-clients.html#AEN3210"
 >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#AEN3284"
+>24.2.2. <A
+HREF="other-clients.html#AEN3225"
 >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#AEN3293"
+>24.2.3. <A
+HREF="other-clients.html#AEN3234"
 >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#AEN3297"
+>24.2.4. <A
+HREF="other-clients.html#AEN3238"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
 ></DL
 ></DD
 ><DT
->25.3. <A
-HREF="other-clients.html#AEN3307"
+>24.3. <A
+HREF="other-clients.html#AEN3248"
 >Windows for Workgroups</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.3.1. <A
-HREF="other-clients.html#AEN3309"
+>24.3.1. <A
+HREF="other-clients.html#AEN3250"
 >Use latest TCP/IP stack from Microsoft</A
 ></DT
 ><DT
->25.3.2. <A
-HREF="other-clients.html#AEN3314"
+>24.3.2. <A
+HREF="other-clients.html#AEN3255"
 >Delete .pwl files after password change</A
 ></DT
 ><DT
->25.3.3. <A
-HREF="other-clients.html#AEN3319"
+>24.3.3. <A
+HREF="other-clients.html#AEN3260"
 >Configure WfW password handling</A
 ></DT
 ><DT
->25.3.4. <A
-HREF="other-clients.html#AEN3323"
+>24.3.4. <A
+HREF="other-clients.html#AEN3264"
 >Case handling of passwords</A
 ></DT
 ></DL
 ></DD
 ><DT
->25.4. <A
-HREF="other-clients.html#AEN3328"
+>24.4. <A
+HREF="other-clients.html#AEN3269"
 >Windows '95/'98</A
 ></DT
 ><DT
->25.5. <A
-HREF="other-clients.html#AEN3344"
+>24.5. <A
+HREF="other-clients.html#AEN3285"
 >Windows 2000 Service Pack 2</A
 ></DT
 ></DL
 ></DD
 ><DT
->26. <A
+>25. <A
 HREF="bugreport.html"
 >Reporting Bugs</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.1. <A
-HREF="bugreport.html#AEN3368"
+>25.1. <A
+HREF="bugreport.html#AEN3309"
 >Introduction</A
 ></DT
 ><DT
->26.2. <A
-HREF="bugreport.html#AEN3378"
+>25.2. <A
+HREF="bugreport.html#AEN3319"
 >General info</A
 ></DT
 ><DT
->26.3. <A
-HREF="bugreport.html#AEN3384"
+>25.3. <A
+HREF="bugreport.html#AEN3325"
 >Debug levels</A
 ></DT
 ><DT
->26.4. <A
-HREF="bugreport.html#AEN3401"
+>25.4. <A
+HREF="bugreport.html#AEN3342"
 >Internal errors</A
 ></DT
 ><DT
->26.5. <A
-HREF="bugreport.html#AEN3411"
+>25.5. <A
+HREF="bugreport.html#AEN3352"
 >Attaching to a running process</A
 ></DT
 ><DT
->26.6. <A
-HREF="bugreport.html#AEN3414"
+>25.6. <A
+HREF="bugreport.html#AEN3355"
 >Patches</A
 ></DT
 ></DL
 ></DD
 ><DT
->27. <A
+>26. <A
 HREF="diagnosis.html"
 >Diagnosing your samba server</A
 ></DT
 ><DD
 ><DL
 ><DT
->27.1. <A
-HREF="diagnosis.html#AEN3437"
+>26.1. <A
+HREF="diagnosis.html#AEN3378"
 >Introduction</A
 ></DT
 ><DT
->27.2. <A
-HREF="diagnosis.html#AEN3442"
+>26.2. <A
+HREF="diagnosis.html#AEN3383"
 >Assumptions</A
 ></DT
 ><DT
->27.3. <A
-HREF="diagnosis.html#AEN3452"
+>26.3. <A
+HREF="diagnosis.html#AEN3393"
 >Tests</A
 ></DT
 ><DD
 ><DL
 ><DT
->27.3.1. <A
-HREF="diagnosis.html#AEN3454"
+>26.3.1. <A
+HREF="diagnosis.html#AEN3395"
 >Test 1</A
 ></DT
 ><DT
->27.3.2. <A
-HREF="diagnosis.html#AEN3460"
+>26.3.2. <A
+HREF="diagnosis.html#AEN3401"
 >Test 2</A
 ></DT
 ><DT
->27.3.3. <A
-HREF="diagnosis.html#AEN3466"
+>26.3.3. <A
+HREF="diagnosis.html#AEN3407"
 >Test 3</A
 ></DT
 ><DT
->27.3.4. <A
-HREF="diagnosis.html#AEN3481"
+>26.3.4. <A
+HREF="diagnosis.html#AEN3422"
 >Test 4</A
 ></DT
 ><DT
->27.3.5. <A
-HREF="diagnosis.html#AEN3486"
+>26.3.5. <A
+HREF="diagnosis.html#AEN3427"
 >Test 5</A
 ></DT
 ><DT
->27.3.6. <A
-HREF="diagnosis.html#AEN3492"
+>26.3.6. <A
+HREF="diagnosis.html#AEN3433"
 >Test 6</A
 ></DT
 ><DT
->27.3.7. <A
-HREF="diagnosis.html#AEN3500"
+>26.3.7. <A
+HREF="diagnosis.html#AEN3441"
 >Test 7</A
 ></DT
 ><DT
->27.3.8. <A
-HREF="diagnosis.html#AEN3526"
+>26.3.8. <A
+HREF="diagnosis.html#AEN3467"
 >Test 8</A
 ></DT
 ><DT
->27.3.9. <A
-HREF="diagnosis.html#AEN3543"
+>26.3.9. <A
+HREF="diagnosis.html#AEN3484"
 >Test 9</A
 ></DT
 ><DT
->27.3.10. <A
-HREF="diagnosis.html#AEN3551"
+>26.3.10. <A
+HREF="diagnosis.html#AEN3492"
 >Test 10</A
 ></DT
 ><DT
->27.3.11. <A
-HREF="diagnosis.html#AEN3557"
+>26.3.11. <A
+HREF="diagnosis.html#AEN3498"
 >Test 11</A
 ></DT
 ></DL
 ></DD
 ><DT
->27.4. <A
-HREF="diagnosis.html#AEN3562"
+>26.4. <A
+HREF="diagnosis.html#AEN3503"
 >Still having troubles?</A
 ></DT
 ></DL
diff --git a/docs/htmldocs/browsing-quick.html b/docs/htmldocs/browsing-quick.html
index cc703d217f..8c597e001f 100644
--- a/docs/htmldocs/browsing-quick.html
+++ b/docs/htmldocs/browsing-quick.html
@@ -5,7 +5,8 @@
 >Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -13,8 +14,8 @@ REL="UP"
 TITLE="General installation"
 HREF="introduction.html"><LINK
 REL="PREVIOUS"
-TITLE="Oplocks"
-HREF="oplocks.html"><LINK
+TITLE="Improved browsing in samba"
+HREF="improved-browsing.html"><LINK
 REL="NEXT"
 TITLE="LanMan and NT Password Encryption in Samba"
 HREF="pwencrypt.html"></HEAD
@@ -45,7 +46,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="oplocks.html"
+HREF="improved-browsing.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -72,9 +73,7 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="BROWSING-QUICK"
-></A
->Chapter 4. Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</H1
+NAME="BROWSING-QUICK">Chapter 3. Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</H1
 ><P
 >This document should be read in conjunction with Browsing and may
 be taken as the fast track guide to implementing browsing across subnets
@@ -86,9 +85,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN393"
-></A
->4.1. Discussion</H1
+NAME="AEN377">3.1. Discussion</H1
 ><P
 >Firstly, all MS Windows networking is based on SMB (Server Message
 Block) based messaging. SMB messaging is implemented using NetBIOS. Samba
@@ -132,9 +129,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN401"
-></A
->4.2. Use of the "Remote Announce" parameter</H1
+NAME="AEN385">3.2. Use of the "Remote Announce" parameter</H1
 ><P
 >The "remote announce" parameter of smb.conf can be used to forcibly ensure
 that all the NetBIOS names on a network get announced to a remote network.
@@ -183,16 +178,14 @@ name resolution problems and should be avoided.</P
 ></DD
 ></DL
 ></DIV
->&#13;</P
+></P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN415"
-></A
->4.3. Use of the "Remote Browse Sync" parameter</H1
+NAME="AEN399">3.3. Use of the "Remote Browse Sync" parameter</H1
 ><P
 >The "remote browse sync" parameter of smb.conf is used to announce to
 another LMB that it must synchronise it's NetBIOS name list with our
@@ -212,9 +205,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN420"
-></A
->4.4. Use of WINS</H1
+NAME="AEN404">3.4. Use of WINS</H1
 ><P
 >Use of WINS (either Samba WINS _or_ MS Windows NT Server WINS) is highly
 recommended. Every NetBIOS machine registers it's name together with a
@@ -274,9 +265,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN431"
-></A
->4.5. Do NOT use more than one (1) protocol on MS Windows machines</H1
+NAME="AEN415">3.5. Do NOT use more than one (1) protocol on MS Windows machines</H1
 ><P
 >A very common cause of browsing problems results from installing more than
 one protocol on an MS Windows machine.</P
@@ -304,9 +293,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN437"
-></A
->4.6. Name Resolution Order</H1
+NAME="AEN421">3.6. Name Resolution Order</H1
 ><P
 >Resolution of NetBIOS names to IP addresses can take place using a number
 of methods. The only ones that can provide NetBIOS name_type information
@@ -401,7 +388,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="oplocks.html"
+HREF="improved-browsing.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -429,7 +416,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Oplocks</TD
+>Improved browsing in samba</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/docs/htmldocs/bugreport.html b/docs/htmldocs/bugreport.html
index 9e21f48556..fcc4b7e91a 100644
--- a/docs/htmldocs/bugreport.html
+++ b/docs/htmldocs/bugreport.html
@@ -5,7 +5,8 @@
 >Reporting Bugs</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="BUGREPORT"
-></A
->Chapter 26. Reporting Bugs</H1
+NAME="BUGREPORT">Chapter 25. Reporting Bugs</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3368"
-></A
->26.1. Introduction</H1
+NAME="AEN3309">25.1. Introduction</H1
 ><P
 >The email address for bug reports for stable releases is <A
 HREF="samba@samba.org"
@@ -125,9 +122,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3378"
-></A
->26.2. General info</H1
+NAME="AEN3319">25.2. General info</H1
 ><P
 >Before submitting a bug report check your config for silly
 errors. Look in your log files for obvious messages that tell you that
@@ -150,9 +145,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3384"
-></A
->26.3. Debug levels</H1
+NAME="AEN3325">25.3. Debug levels</H1
 ><P
 >If the bug has anything to do with Samba behaving incorrectly as a
 server (like refusing to open a file) then the log files will probably
@@ -220,9 +213,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3401"
-></A
->26.4. Internal errors</H1
+NAME="AEN3342">25.4. Internal errors</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
@@ -264,9 +255,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3411"
-></A
->26.5. Attaching to a running process</H1
+NAME="AEN3352">25.5. Attaching to a running process</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
@@ -281,9 +270,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3414"
-></A
->26.6. Patches</H1
+NAME="AEN3355">25.6. Patches</H1
 ><P
 >The best sort of bug report is one that includes a fix! If you send us
 patches please use <B
diff --git a/docs/htmldocs/cvs-access.html b/docs/htmldocs/cvs-access.html
index fe82189eba..73cd333805 100644
--- a/docs/htmldocs/cvs-access.html
+++ b/docs/htmldocs/cvs-access.html
@@ -5,7 +5,8 @@
 >HOWTO Access Samba source code via CVS</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="CVS-ACCESS"
-></A
->Chapter 21. HOWTO Access Samba source code via CVS</H1
+NAME="CVS-ACCESS">Chapter 20. HOWTO Access Samba source code via CVS</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2974"
-></A
->21.1. Introduction</H1
+NAME="AEN2964">20.1. Introduction</H1
 ><P
 >Samba is developed in an open environment.  Developers use CVS
 (Concurrent Versioning System) to "checkin" (also known as 
@@ -102,9 +99,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2979"
-></A
->21.2. CVS Access to samba.org</H1
+NAME="AEN2969">20.2. CVS Access to samba.org</H1
 ><P
 >The machine samba.org runs a publicly accessible CVS 
 repository for access to the source code of several packages, 
@@ -115,9 +110,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2982"
-></A
->21.2.1. Access via CVSweb</H2
+NAME="AEN2972">20.2.1. Access via CVSweb</H2
 ><P
 >You can access the source code via your 
 favourite WWW browser. This allows you to access the contents of 
@@ -136,9 +129,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2987"
-></A
->21.2.2. Access via cvs</H2
+NAME="AEN2977">20.2.2. Access via cvs</H2
 ><P
 >You can also access the source code via a 
 normal cvs client.  This gives you much more control over you can 
diff --git a/docs/htmldocs/diagnosis.html b/docs/htmldocs/diagnosis.html
index eaa550dc30..a7b2e59436 100644
--- a/docs/htmldocs/diagnosis.html
+++ b/docs/htmldocs/diagnosis.html
@@ -5,7 +5,8 @@
 >Diagnosing your samba server</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -65,17 +66,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="DIAGNOSIS"
-></A
->Chapter 27. Diagnosing your samba server</H1
+NAME="DIAGNOSIS">Chapter 26. Diagnosing your samba server</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3437"
-></A
->27.1. Introduction</H1
+NAME="AEN3378">26.1. Introduction</H1
 ><P
 >This file contains a list of tests you can perform to validate your
 Samba server. It also tells you what the likely cause of the problem
@@ -95,9 +92,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3442"
-></A
->27.2. Assumptions</H1
+NAME="AEN3383">26.2. Assumptions</H1
 ><P
 >In all of the tests it is assumed you have a Samba server called 
 BIGSERVER and a PC called ACLIENT both in workgroup TESTGROUP.</P
@@ -133,17 +128,13 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3452"
-></A
->27.3. Tests</H1
+NAME="AEN3393">26.3. Tests</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3454"
-></A
->27.3.1. Test 1</H2
+NAME="AEN3395">26.3.1. Test 1</H2
 ><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
@@ -163,9 +154,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3460"
-></A
->27.3.2. Test 2</H2
+NAME="AEN3401">26.3.2. Test 2</H2
 ><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
@@ -189,9 +178,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3466"
-></A
->27.3.3. Test 3</H2
+NAME="AEN3407">26.3.3. Test 3</H2
 ><P
 >Run the command "smbclient -L BIGSERVER" on the unix box. You
 should get a list of available shares back. </P
@@ -260,9 +247,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3481"
-></A
->27.3.4. Test 4</H2
+NAME="AEN3422">26.3.4. Test 4</H2
 ><P
 >Run the command "nmblookup -B BIGSERVER __SAMBA__". You should get the
 IP address of your Samba server back.</P
@@ -281,9 +266,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3486"
-></A
->27.3.5. Test 5</H2
+NAME="AEN3427">26.3.5. Test 5</H2
 ><P
 >run the command <B
 CLASS="COMMAND"
@@ -302,9 +285,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3492"
-></A
->27.3.6. Test 6</H2
+NAME="AEN3433">26.3.6. Test 6</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -336,9 +317,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3500"
-></A
->27.3.7. Test 7</H2
+NAME="AEN3441">26.3.7. Test 7</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -425,9 +404,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3526"
-></A
->27.3.8. Test 8</H2
+NAME="AEN3467">26.3.8. Test 8</H2
 ><P
 >On the PC type the command <B
 CLASS="COMMAND"
@@ -485,9 +462,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3543"
-></A
->27.3.9. Test 9</H2
+NAME="AEN3484">26.3.9. Test 9</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -519,9 +494,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3551"
-></A
->27.3.10. Test 10</H2
+NAME="AEN3492">26.3.10. Test 10</H2
 ><P
 >Run the command <B
 CLASS="COMMAND"
@@ -545,9 +518,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3557"
-></A
->27.3.11. Test 11</H2
+NAME="AEN3498">26.3.11. Test 11</H2
 ><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
@@ -573,9 +544,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3562"
-></A
->27.4. Still having troubles?</H1
+NAME="AEN3503">26.4. Still having troubles?</H1
 ><P
 >Try the mailing list or newsgroup, or use the ethereal utility to
 sniff the problem. The official samba mailing list can be reached at
diff --git a/docs/htmldocs/domain-security.html b/docs/htmldocs/domain-security.html
index 1a10767235..670d96ba5f 100644
--- a/docs/htmldocs/domain-security.html
+++ b/docs/htmldocs/domain-security.html
@@ -5,7 +5,8 @@
 >Samba as a NT4 domain member</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="DOMAIN-SECURITY"
-></A
->Chapter 10. Samba as a NT4 domain member</H1
+NAME="DOMAIN-SECURITY">Chapter 9. Samba as a NT4 domain member</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1286"
-></A
->10.1. Joining an NT Domain with Samba 2.2</H1
+NAME="AEN1273">9.1. Joining an NT Domain with Samba 2.2</H1
 ><P
 >Assume you have a Samba 2.x server with a NetBIOS name of 
 	<TT
@@ -311,9 +308,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1350"
-></A
->10.2. Samba and Windows 2000 Domains</H1
+NAME="AEN1337">9.2. Samba and Windows 2000 Domains</H1
 ><P
 >Many people have asked regarding the state of Samba's ability to participate in
 a Windows 2000 Domain.  Samba 3.0 is able to act as a member server of a Windows
@@ -336,9 +331,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1355"
-></A
->10.3. Why is this better than security = server?</H1
+NAME="AEN1342">9.3. Why is this better than security = server?</H1
 ><P
 >Currently, domain security in Samba doesn't free you from 
 	having to create local Unix users to represent the users attaching 
diff --git a/docs/htmldocs/findsmb.1.html b/docs/htmldocs/findsmb.1.html
index 618363c104..af7100ed6f 100644
--- a/docs/htmldocs/findsmb.1.html
+++ b/docs/htmldocs/findsmb.1.html
@@ -1,11 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML
 ><HEAD
 ><TITLE
 >findsmb</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"></HEAD
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"></HEAD
 ><BODY
 CLASS="REFENTRY"
 BGCOLOR="#FFFFFF"
@@ -15,9 +16,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="FINDSMB"
-></A
->findsmb</H1
+NAME="FINDSMB">findsmb</H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
@@ -30,15 +29,13 @@ NAME="AEN5"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8"
-></A
-><H2
+NAME="AEN8"><H2
 >Synopsis</H2
 ><P
 ><B
 CLASS="COMMAND"
 >findsmb</B
->  [subnet broadcast address]</P
+> [subnet broadcast address]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
@@ -90,6 +87,30 @@ NAME="AEN22"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>-r</DT
+><DD
+><P
+>Controls whether <B
+CLASS="COMMAND"
+>findsmb</B
+> takes
+		bugs in Windows95 into account when trying to find a Netbios name
+		registered of the remote machine. This option is disabled by default
+		because it is specific to Windows 95 and Windows 95 machines only. 
+		If set, <A
+HREF="nmblookup.1.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>nmblookup</B
+></A
+>
+		will be called with <TT
+CLASS="CONSTANT"
+>-B</TT
+> option.</P
+></DD
+><DT
 >subnet broadcast address</DT
 ><DD
 ><P
@@ -117,7 +138,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN33"
+NAME="AEN41"
 ></A
 ><H2
 >EXAMPLES</H2
@@ -141,7 +162,11 @@ CLASS="COMMAND"
 	not show any information about the operating system or server 
 	version.</P
 ><P
->The command must be run on a system without <A
+>The command with <TT
+CLASS="CONSTANT"
+>-r</TT
+> option
+	must be run on a system without <A
 HREF="nmbd.8.html"
 TARGET="_top"
 ><B
@@ -155,17 +180,30 @@ CLASS="COMMAND"
 > is running on the system, you will 
 	only  get the IP address and the DNS name of the machine. To 
 	get proper responses  from Windows 95 and Windows 98 machines, 
-	the command must be run as root. </P
+	the command must be run as root and with <TT
+CLASS="CONSTANT"
+>-r</TT
+>
+	option on a machine without <B
+CLASS="COMMAND"
+>nmbd</B
+> running.</P
 ><P
 >For example, running <B
 CLASS="COMMAND"
 >findsmb</B
-> on a machine 
-	without <B
-CLASS="COMMAND"
->nmbd</B
-> running would yield output similar
+> without 
+	<TT
+CLASS="CONSTANT"
+>-r</TT
+> option set would yield output similar
 	to the following</P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="SCREEN"
 ><TT
@@ -184,11 +222,14 @@ CLASS="COMPUTEROUTPUT"
 192.168.35.97   HERBNT1       *[HERB-NT] [Windows NT 4.0] [NT LAN Manager 4.0]
 	</TT
 ></PRE
+></TD
+></TR
+></TABLE
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN48"
+NAME="AEN59"
 ></A
 ><H2
 >VERSION</H2
@@ -199,7 +240,7 @@ NAME="AEN48"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN51"
+NAME="AEN62"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -233,7 +274,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN60"
+NAME="AEN71"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/groupmapping.html b/docs/htmldocs/groupmapping.html
index c23a2094be..84cf521fc9 100644
--- a/docs/htmldocs/groupmapping.html
+++ b/docs/htmldocs/groupmapping.html
@@ -5,7 +5,8 @@
 >Group mapping HOWTO</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,9 +73,7 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="GROUPMAPPING"
-></A
->Chapter 22. Group mapping HOWTO</H1
+NAME="GROUPMAPPING">Chapter 21. Group mapping HOWTO</H1
 ><P
 > 
 Starting with Samba 3.0 alpha 2, a new group mapping function is available. The
diff --git a/docs/htmldocs/improved-browsing.html b/docs/htmldocs/improved-browsing.html
index 7609ce69cd..4e9d7f639e 100644
--- a/docs/htmldocs/improved-browsing.html
+++ b/docs/htmldocs/improved-browsing.html
@@ -5,7 +5,8 @@
 >Improved browsing in samba</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -16,8 +17,8 @@ REL="PREVIOUS"
 TITLE="How to Install and Test SAMBA"
 HREF="install.html"><LINK
 REL="NEXT"
-TITLE="Oplocks"
-HREF="oplocks.html"></HEAD
+TITLE="Quick Cross Subnet Browsing / Cross Workgroup Browsing guide"
+HREF="browsing-quick.html"></HEAD
 ><BODY
 CLASS="CHAPTER"
 BGCOLOR="#FFFFFF"
@@ -59,7 +60,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="oplocks.html"
+HREF="browsing-quick.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="IMPROVED-BROWSING"
-></A
->Chapter 2. Improved browsing in samba</H1
+NAME="IMPROVED-BROWSING">Chapter 2. Improved browsing in samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN229"
-></A
->2.1. Overview of browsing</H1
+NAME="AEN229">2.1. Overview of browsing</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
@@ -104,9 +101,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN233"
-></A
->2.2. Browsing support in samba</H1
+NAME="AEN233">2.2. Browsing support in samba</H1
 ><P
 >Samba now fully supports browsing.  The browsing is supported by nmbd
 and is also controlled by options in the smb.conf file (see smb.conf(5)).</P
@@ -149,9 +144,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN242"
-></A
->2.3. Problem resolution</H1
+NAME="AEN242">2.3. Problem resolution</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
@@ -183,9 +176,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN249"
-></A
->2.4. Browsing across subnets</H1
+NAME="AEN249">2.4. Browsing across subnets</H1
 ><P
 >With the release of Samba 1.9.17(alpha1 and above) Samba has been
 updated to enable it to support the replication of browse lists
@@ -214,9 +205,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN254"
-></A
->2.4.1. How does cross subnet browsing work ?</H2
+NAME="AEN254">2.4.1. How does cross subnet browsing work ?</H2
 ><P
 >Cross subnet browsing is a complicated dance, containing multiple
 moving parts.  It has taken Microsoft several years to get the code
@@ -426,9 +415,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN289"
-></A
->2.5. Setting up a WINS server</H1
+NAME="AEN289">2.5. Setting up a WINS server</H1
 ><P
 >Either a Samba machine or a Windows NT Server machine may be set up
 as a WINS server.  To set a Samba machine to be a WINS server you must
@@ -509,9 +496,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN308"
-></A
->2.6. Setting up Browsing in a WORKGROUP</H1
+NAME="AEN308">2.6. Setting up Browsing in a WORKGROUP</H1
 ><P
 >To set up cross subnet browsing on a network containing machines
 in up to be in a WORKGROUP, not an NT Domain you need to set up one
@@ -593,9 +578,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN326"
-></A
->2.7. Setting up Browsing in a DOMAIN</H1
+NAME="AEN326">2.7. Setting up Browsing in a DOMAIN</H1
 ><P
 >If you are adding Samba servers to a Windows NT Domain then
 you must not set up a Samba server as a domain master browser.
@@ -644,9 +627,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN336"
-></A
->2.8. Forcing samba to be the master</H1
+NAME="AEN336">2.8. Forcing samba to be the master</H1
 ><P
 >Who becomes the "master browser" is determined by an election process
 using broadcasts.  Each election packet contains a number of parameters
@@ -692,9 +673,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN345"
-></A
->2.9. Making samba the domain master</H1
+NAME="AEN345">2.9. Making samba the domain master</H1
 ><P
 >The domain master is responsible for collating the browse lists of
 multiple subnets so that browsing can occur between subnets.  You can
@@ -765,9 +744,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN363"
-></A
->2.10. Note about broadcast addresses</H1
+NAME="AEN363">2.10. Note about broadcast addresses</H1
 ><P
 >If your network uses a "0" based broadcast address (for example if it
 ends in a 0) then you will strike problems.  Windows for Workgroups
@@ -779,9 +756,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN366"
-></A
->2.11. Multiple interfaces</H1
+NAME="AEN366">2.11. Multiple interfaces</H1
 ><P
 >Samba now supports machines with multiple network interfaces.  If you
 have multiple interfaces then you will need to use the "interfaces"
@@ -822,7 +797,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="oplocks.html"
+HREF="browsing-quick.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -846,7 +821,7 @@ ACCESSKEY="U"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Oplocks</TD
+>Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/docs/htmldocs/install.html b/docs/htmldocs/install.html
index 22cd3f32c5..0ba79dbe26 100644
--- a/docs/htmldocs/install.html
+++ b/docs/htmldocs/install.html
@@ -5,7 +5,8 @@
 >How to Install and Test SAMBA</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="INSTALL"
-></A
->Chapter 1. How to Install and Test SAMBA</H1
+NAME="INSTALL">Chapter 1. How to Install and Test SAMBA</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN26"
-></A
->1.1. Read the man pages</H1
+NAME="AEN26">1.1. Read the man pages</H1
 ><P
 >The man pages distributed with SAMBA contain 
 	lots of useful info that will help to get you started. 
@@ -122,9 +119,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN36"
-></A
->1.2. Building the Binaries</H1
+NAME="AEN36">1.2. Building the Binaries</H1
 ><P
 >To do this, first run the program <B
 CLASS="COMMAND"
@@ -221,9 +216,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN64"
-></A
->1.3. The all important step</H1
+NAME="AEN64">1.3. The all important step</H1
 ><P
 >At this stage you must fetch yourself a 
 	coffee or other drink you find stimulating. Getting the rest 
@@ -238,9 +231,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN68"
-></A
->1.4. Create the smb configuration file.</H1
+NAME="AEN68">1.4. Create the smb configuration file.</H1
 ><P
 >There are sample configuration files in the examples 
 	subdirectory in the distribution. I suggest you read them 
@@ -294,9 +285,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN82"
-></A
->1.5. Test your config file with 
+NAME="AEN82">1.5. Test your config file with 
 	<B
 CLASS="COMMAND"
 >testparm</B
@@ -324,9 +313,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN90"
-></A
->1.6. Starting the smbd and nmbd</H1
+NAME="AEN90">1.6. Starting the smbd and nmbd</H1
 ><P
 >You must choose to start smbd and nmbd either
 	as daemons or from <B
@@ -364,9 +351,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN100"
-></A
->1.6.1. Starting from inetd.conf</H2
+NAME="AEN100">1.6.1. Starting from inetd.conf</H2
 ><P
 >NOTE; The following will be different if 
 		you use NIS or NIS+ to distributed services maps.</P
@@ -468,9 +453,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN129"
-></A
->1.6.2. Alternative: starting it as a daemon</H2
+NAME="AEN129">1.6.2. Alternative: starting it as a daemon</H2
 ><P
 >To start the server as a daemon you should create 
 		a script something like this one, perhaps calling 
@@ -525,9 +508,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN145"
-></A
->1.7. Try listing the shares available on your 
+NAME="AEN145">1.7. Try listing the shares available on your 
 	server</H1
 ><P
 ><TT
@@ -566,9 +547,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN154"
-></A
->1.8. Try connecting with the unix client</H1
+NAME="AEN154">1.8. Try connecting with the unix client</H1
 ><P
 ><TT
 CLASS="PROMPT"
@@ -629,9 +608,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN170"
-></A
->1.9. Try connecting from a DOS, WfWg, Win9x, WinNT, 
+NAME="AEN170">1.9. Try connecting from a DOS, WfWg, Win9x, WinNT, 
 	Win2k, OS/2, etc... client</H1
 ><P
 >Try mounting disks. eg:</P
@@ -678,9 +655,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN184"
-></A
->1.10. What If Things Don't Work?</H1
+NAME="AEN184">1.10. What If Things Don't Work?</H1
 ><P
 >If nothing works and you start to think "who wrote 
 	this pile of trash" then I suggest you do step 2 again (and 
@@ -701,9 +676,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN189"
-></A
->1.10.1. Diagnosing Problems</H2
+NAME="AEN189">1.10.1. Diagnosing Problems</H2
 ><P
 >If you have installation problems then go to the
 		<A
@@ -718,9 +691,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN193"
-></A
->1.10.2. Scope IDs</H2
+NAME="AEN193">1.10.2. Scope IDs</H2
 ><P
 >By default Samba uses a blank scope ID. This means 
 		all your windows boxes must also have a blank scope ID. 
@@ -734,9 +705,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN196"
-></A
->1.10.3. Choosing the Protocol Level</H2
+NAME="AEN196">1.10.3. Choosing the Protocol Level</H2
 ><P
 >The SMB protocol has many dialects. Currently 
 		Samba supports 5, called CORE, COREPLUS, LANMAN1, 
@@ -775,9 +744,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN205"
-></A
->1.10.4. Printing from UNIX to a Client PC</H2
+NAME="AEN205">1.10.4. Printing from UNIX to a Client PC</H2
 ><P
 >To use a printer that is available via a smb-based 
 		server from a unix host with LPR you will need to compile the 
@@ -796,9 +763,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN210"
-></A
->1.10.5. Locking</H2
+NAME="AEN210">1.10.5. Locking</H2
 ><P
 >One area which sometimes causes trouble is locking.</P
 ><P
@@ -856,9 +821,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN219"
-></A
->1.10.6. Mapping Usernames</H2
+NAME="AEN219">1.10.6. Mapping Usernames</H2
 ><P
 >If you have different usernames on the PCs and 
 		the unix server then take a look at the "username map" option. 
diff --git a/docs/htmldocs/integrate-ms-networks.html b/docs/htmldocs/integrate-ms-networks.html
index a3b51283d0..ad6aa9e225 100644
--- a/docs/htmldocs/integrate-ms-networks.html
+++ b/docs/htmldocs/integrate-ms-networks.html
@@ -5,7 +5,8 @@
 >Integrating MS Windows networks with Samba</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="INTEGRATE-MS-NETWORKS"
-></A
->Chapter 11. Integrating MS Windows networks with Samba</H1
+NAME="INTEGRATE-MS-NETWORKS">Chapter 10. Integrating MS Windows networks with Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1387"
-></A
->11.1. Agenda</H1
+NAME="AEN1374">10.1. Agenda</H1
 ><P
 >To identify the key functional mechanisms of MS Windows networking 
 to enable the deployment of Samba as a means of extending and/or 
@@ -147,9 +144,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1409"
-></A
->11.2. Name Resolution in a pure Unix/Linux world</H1
+NAME="AEN1396">10.2. Name Resolution in a pure Unix/Linux world</H1
 ><P
 >The key configuration files covered in this section are:</P
 ><P
@@ -189,9 +184,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1425"
-></A
->11.2.1. <TT
+NAME="AEN1412">10.2.1. <TT
 CLASS="FILENAME"
 >/etc/hosts</TT
 ></H2
@@ -270,9 +263,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1441"
-></A
->11.2.2. <TT
+NAME="AEN1428">10.2.2. <TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
 ></H2
@@ -308,9 +299,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1452"
-></A
->11.2.3. <TT
+NAME="AEN1439">10.2.3. <TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
 ></H2
@@ -337,9 +326,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1460"
-></A
->11.2.4. <TT
+NAME="AEN1447">10.2.4. <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
 ></H2
@@ -406,9 +393,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1472"
-></A
->11.3. Name resolution as used within MS Windows networking</H1
+NAME="AEN1459">10.3. Name resolution as used within MS Windows networking</H1
 ><P
 >MS Windows networking is predicated about the name each machine 
 is given. This name is known variously (and inconsistently) as 
@@ -491,9 +476,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1484"
-></A
->11.3.1. The NetBIOS Name Cache</H2
+NAME="AEN1471">10.3.1. The NetBIOS Name Cache</H2
 ><P
 >All MS Windows machines employ an in memory buffer in which is 
 stored the NetBIOS names and IP addresses for all external 
@@ -518,9 +501,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1489"
-></A
->11.3.2. The LMHOSTS file</H2
+NAME="AEN1476">10.3.2. The LMHOSTS file</H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 
 2000 in <TT
@@ -621,9 +602,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1497"
-></A
->11.3.3. HOSTS file</H2
+NAME="AEN1484">10.3.3. HOSTS file</H2
 ><P
 >This file is usually located in MS Windows NT 4.0 or 2000 in 
 <TT
@@ -643,9 +622,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1502"
-></A
->11.3.4. DNS Lookup</H2
+NAME="AEN1489">10.3.4. DNS Lookup</H2
 ><P
 >This capability is configured in the TCP/IP setup area in the network 
 configuration facility. If enabled an elaborate name resolution sequence 
@@ -663,9 +640,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1505"
-></A
->11.3.5. WINS Lookup</H2
+NAME="AEN1492">10.3.5. WINS Lookup</H2
 ><P
 >A WINS (Windows Internet Name Server) service is the equivaent of the 
 rfc1001/1002 specified NBNS (NetBIOS Name Server). A WINS server stores 
@@ -706,9 +681,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1517"
-></A
->11.4. How browsing functions and how to deploy stable and 
+NAME="AEN1504">10.4. How browsing functions and how to deploy stable and 
 dependable browsing using Samba</H1
 ><P
 >As stated above, MS Windows machines register their NetBIOS names 
@@ -773,9 +746,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1527"
-></A
->11.5. MS Windows security options and how to configure 
+NAME="AEN1514">10.5. MS Windows security options and how to configure 
 Samba for seemless integration</H1
 ><P
 >MS Windows clients may use encrypted passwords as part of a 
@@ -910,9 +881,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1555"
-></A
->11.5.1. Use MS Windows NT as an authentication server</H2
+NAME="AEN1542">10.5.1. Use MS Windows NT as an authentication server</H2
 ><P
 >This method involves the additions of the following parameters 
 in the smb.conf file:</P
@@ -946,9 +915,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1563"
-></A
->11.5.2. Make Samba a member of an MS Windows NT security domain</H2
+NAME="AEN1550">10.5.2. Make Samba a member of an MS Windows NT security domain</H2
 ><P
 >This method involves additon of the following paramters in the smb.conf file:</P
 ><P
@@ -1009,9 +976,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1580"
-></A
->11.5.3. Configure Samba as an authentication server</H2
+NAME="AEN1567">10.5.3. Configure Samba as an authentication server</H2
 ><P
 >This mode of authentication demands that there be on the 
 Unix/Linux system both a Unix style account as well as an 
@@ -1046,9 +1011,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1587"
-></A
->11.5.3.1. Users</H3
+NAME="AEN1574">10.5.3.1. Users</H3
 ><P
 >A user account that may provide a home directory should be 
 created. The following Linux system commands are typical of 
@@ -1069,9 +1032,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1592"
-></A
->11.5.3.2. MS Windows NT Machine Accounts</H3
+NAME="AEN1579">10.5.3.2. MS Windows NT Machine Accounts</H3
 ><P
 >These are required only when Samba is used as a domain 
 controller.  Refer to the Samba-PDC-HOWTO for more details.</P
@@ -1090,9 +1051,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1597"
-></A
->11.6. Conclusions</H1
+NAME="AEN1584">10.6. Conclusions</H1
 ><P
 >Samba provides a flexible means to operate as...</P
 ><P
diff --git a/docs/htmldocs/introduction.html b/docs/htmldocs/introduction.html
index 581687e8ab..762d56ba6a 100644
--- a/docs/htmldocs/introduction.html
+++ b/docs/htmldocs/introduction.html
@@ -5,7 +5,8 @@
 >General installation</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -68,9 +69,7 @@ WIDTH="100%"></DIV
 ><DIV
 CLASS="PART"
 ><A
-NAME="INTRODUCTION"
-></A
-><DIV
+NAME="INTRODUCTION"><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
@@ -78,9 +77,7 @@ CLASS="TITLE"
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN21"
-></A
-><H1
+NAME="AEN21"><H1
 >Introduction</H1
 ><P
 >This part contains general info on how to install samba 
@@ -282,91 +279,77 @@ HREF="improved-browsing.html#AEN366"
 ></DD
 ><DT
 >3. <A
-HREF="oplocks.html"
->Oplocks</A
-></DT
-><DD
-><DL
-><DT
->3.1. <A
-HREF="oplocks.html#AEN378"
->What are oplocks?</A
-></DT
-></DL
-></DD
-><DT
->4. <A
 HREF="browsing-quick.html"
 >Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</A
 ></DT
 ><DD
 ><DL
 ><DT
->4.1. <A
-HREF="browsing-quick.html#AEN393"
+>3.1. <A
+HREF="browsing-quick.html#AEN377"
 >Discussion</A
 ></DT
 ><DT
->4.2. <A
-HREF="browsing-quick.html#AEN401"
+>3.2. <A
+HREF="browsing-quick.html#AEN385"
 >Use of the "Remote Announce" parameter</A
 ></DT
 ><DT
->4.3. <A
-HREF="browsing-quick.html#AEN415"
+>3.3. <A
+HREF="browsing-quick.html#AEN399"
 >Use of the "Remote Browse Sync" parameter</A
 ></DT
 ><DT
->4.4. <A
-HREF="browsing-quick.html#AEN420"
+>3.4. <A
+HREF="browsing-quick.html#AEN404"
 >Use of WINS</A
 ></DT
 ><DT
->4.5. <A
-HREF="browsing-quick.html#AEN431"
+>3.5. <A
+HREF="browsing-quick.html#AEN415"
 >Do NOT use more than one (1) protocol on MS Windows machines</A
 ></DT
 ><DT
->4.6. <A
-HREF="browsing-quick.html#AEN437"
+>3.6. <A
+HREF="browsing-quick.html#AEN421"
 >Name Resolution Order</A
 ></DT
 ></DL
 ></DD
 ><DT
->5. <A
+>4. <A
 HREF="pwencrypt.html"
 >LanMan and NT Password Encryption in Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->5.1. <A
-HREF="pwencrypt.html#AEN473"
+>4.1. <A
+HREF="pwencrypt.html#AEN457"
 >Introduction</A
 ></DT
 ><DT
->5.2. <A
-HREF="pwencrypt.html#AEN478"
+>4.2. <A
+HREF="pwencrypt.html#AEN462"
 >Important Notes About Security</A
 ></DT
 ><DD
 ><DL
 ><DT
->5.2.1. <A
-HREF="pwencrypt.html#AEN497"
+>4.2.1. <A
+HREF="pwencrypt.html#AEN481"
 >Advantages of SMB Encryption</A
 ></DT
 ><DT
->5.2.2. <A
-HREF="pwencrypt.html#AEN504"
+>4.2.2. <A
+HREF="pwencrypt.html#AEN488"
 >Advantages of non-encrypted passwords</A
 ></DT
 ></DL
 ></DD
 ><DT
->5.3. <A
-HREF="pwencrypt.html#AEN513"
+>4.3. <A
+HREF="pwencrypt.html#AEN497"
 >The smbpasswd Command</A
 ></DT
 ></DL
diff --git a/docs/htmldocs/msdfs.html b/docs/htmldocs/msdfs.html
index 832187d19f..f6fe1c7e1d 100644
--- a/docs/htmldocs/msdfs.html
+++ b/docs/htmldocs/msdfs.html
@@ -5,7 +5,8 @@
 >Hosting a Microsoft Distributed File System tree on Samba</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -73,17 +74,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="MSDFS"
-></A
->Chapter 14. Hosting a Microsoft Distributed File System tree on Samba</H1
+NAME="MSDFS">Chapter 13. Hosting a Microsoft Distributed File System tree on Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1872"
-></A
->14.1. Instructions</H1
+NAME="AEN1859">13.1. Instructions</H1
 ><P
 >The Distributed File System (or Dfs) provides a means of 
 	separating the logical view of files and directories that users 
@@ -229,9 +226,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1907"
-></A
->14.1.1. Notes</H2
+NAME="AEN1894">13.1.1. Notes</H2
 ><P
 ></P
 ><UL
diff --git a/docs/htmldocs/optional.html b/docs/htmldocs/optional.html
index da152ea1ca..b15515ddab 100644
--- a/docs/htmldocs/optional.html
+++ b/docs/htmldocs/optional.html
@@ -5,7 +5,8 @@
 >Optional configuration</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -68,9 +69,7 @@ WIDTH="100%"></DIV
 ><DIV
 CLASS="PART"
 ><A
-NAME="OPTIONAL"
-></A
-><DIV
+NAME="OPTIONAL"><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
@@ -78,9 +77,7 @@ CLASS="TITLE"
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN1373"
-></A
-><H1
+NAME="AEN1360"><H1
 >Introduction</H1
 ><P
 >Samba has several features that you might want or might not want to use. The chapters in this 
@@ -94,51 +91,51 @@ CLASS="TOC"
 >Table of Contents</B
 ></DT
 ><DT
->11. <A
+>10. <A
 HREF="integrate-ms-networks.html"
 >Integrating MS Windows networks with Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="integrate-ms-networks.html#AEN1387"
+>10.1. <A
+HREF="integrate-ms-networks.html#AEN1374"
 >Agenda</A
 ></DT
 ><DT
->11.2. <A
-HREF="integrate-ms-networks.html#AEN1409"
+>10.2. <A
+HREF="integrate-ms-networks.html#AEN1396"
 >Name Resolution in a pure Unix/Linux world</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.2.1. <A
-HREF="integrate-ms-networks.html#AEN1425"
+>10.2.1. <A
+HREF="integrate-ms-networks.html#AEN1412"
 ><TT
 CLASS="FILENAME"
 >/etc/hosts</TT
 ></A
 ></DT
 ><DT
->11.2.2. <A
-HREF="integrate-ms-networks.html#AEN1441"
+>10.2.2. <A
+HREF="integrate-ms-networks.html#AEN1428"
 ><TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
 ></A
 ></DT
 ><DT
->11.2.3. <A
-HREF="integrate-ms-networks.html#AEN1452"
+>10.2.3. <A
+HREF="integrate-ms-networks.html#AEN1439"
 ><TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
 ></A
 ></DT
 ><DT
->11.2.4. <A
-HREF="integrate-ms-networks.html#AEN1460"
+>10.2.4. <A
+HREF="integrate-ms-networks.html#AEN1447"
 ><TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
@@ -147,140 +144,140 @@ CLASS="FILENAME"
 ></DL
 ></DD
 ><DT
->11.3. <A
-HREF="integrate-ms-networks.html#AEN1472"
+>10.3. <A
+HREF="integrate-ms-networks.html#AEN1459"
 >Name resolution as used within MS Windows networking</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.3.1. <A
-HREF="integrate-ms-networks.html#AEN1484"
+>10.3.1. <A
+HREF="integrate-ms-networks.html#AEN1471"
 >The NetBIOS Name Cache</A
 ></DT
 ><DT
->11.3.2. <A
-HREF="integrate-ms-networks.html#AEN1489"
+>10.3.2. <A
+HREF="integrate-ms-networks.html#AEN1476"
 >The LMHOSTS file</A
 ></DT
 ><DT
->11.3.3. <A
-HREF="integrate-ms-networks.html#AEN1497"
+>10.3.3. <A
+HREF="integrate-ms-networks.html#AEN1484"
 >HOSTS file</A
 ></DT
 ><DT
->11.3.4. <A
-HREF="integrate-ms-networks.html#AEN1502"
+>10.3.4. <A
+HREF="integrate-ms-networks.html#AEN1489"
 >DNS Lookup</A
 ></DT
 ><DT
->11.3.5. <A
-HREF="integrate-ms-networks.html#AEN1505"
+>10.3.5. <A
+HREF="integrate-ms-networks.html#AEN1492"
 >WINS Lookup</A
 ></DT
 ></DL
 ></DD
 ><DT
->11.4. <A
-HREF="integrate-ms-networks.html#AEN1517"
+>10.4. <A
+HREF="integrate-ms-networks.html#AEN1504"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></DT
 ><DT
->11.5. <A
-HREF="integrate-ms-networks.html#AEN1527"
+>10.5. <A
+HREF="integrate-ms-networks.html#AEN1514"
 >MS Windows security options and how to configure 
 Samba for seemless integration</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.5.1. <A
-HREF="integrate-ms-networks.html#AEN1555"
+>10.5.1. <A
+HREF="integrate-ms-networks.html#AEN1542"
 >Use MS Windows NT as an authentication server</A
 ></DT
 ><DT
->11.5.2. <A
-HREF="integrate-ms-networks.html#AEN1563"
+>10.5.2. <A
+HREF="integrate-ms-networks.html#AEN1550"
 >Make Samba a member of an MS Windows NT security domain</A
 ></DT
 ><DT
->11.5.3. <A
-HREF="integrate-ms-networks.html#AEN1580"
+>10.5.3. <A
+HREF="integrate-ms-networks.html#AEN1567"
 >Configure Samba as an authentication server</A
 ></DT
 ></DL
 ></DD
 ><DT
->11.6. <A
-HREF="integrate-ms-networks.html#AEN1597"
+>10.6. <A
+HREF="integrate-ms-networks.html#AEN1584"
 >Conclusions</A
 ></DT
 ></DL
 ></DD
 ><DT
->12. <A
+>11. <A
 HREF="unix-permissions.html"
 >UNIX Permission Bits and Windows NT Access Control Lists</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.1. <A
-HREF="unix-permissions.html#AEN1618"
+>11.1. <A
+HREF="unix-permissions.html#AEN1605"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
->12.2. <A
-HREF="unix-permissions.html#AEN1627"
+>11.2. <A
+HREF="unix-permissions.html#AEN1614"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
->12.3. <A
-HREF="unix-permissions.html#AEN1638"
+>11.3. <A
+HREF="unix-permissions.html#AEN1625"
 >Viewing file ownership</A
 ></DT
 ><DT
->12.4. <A
-HREF="unix-permissions.html#AEN1658"
+>11.4. <A
+HREF="unix-permissions.html#AEN1645"
 >Viewing file or directory permissions</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.4.1. <A
-HREF="unix-permissions.html#AEN1673"
+>11.4.1. <A
+HREF="unix-permissions.html#AEN1660"
 >File Permissions</A
 ></DT
 ><DT
->12.4.2. <A
-HREF="unix-permissions.html#AEN1687"
+>11.4.2. <A
+HREF="unix-permissions.html#AEN1674"
 >Directory Permissions</A
 ></DT
 ></DL
 ></DD
 ><DT
->12.5. <A
-HREF="unix-permissions.html#AEN1694"
+>11.5. <A
+HREF="unix-permissions.html#AEN1681"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
->12.6. <A
-HREF="unix-permissions.html#AEN1716"
+>11.6. <A
+HREF="unix-permissions.html#AEN1703"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
->12.7. <A
-HREF="unix-permissions.html#AEN1780"
+>11.7. <A
+HREF="unix-permissions.html#AEN1767"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
 ></DL
 ></DD
 ><DT
->13. <A
+>12. <A
 HREF="pam.html"
 >Configuring PAM for distributed but centrally 
 managed authentication</A
@@ -288,39 +285,39 @@ managed authentication</A
 ><DD
 ><DL
 ><DT
->13.1. <A
-HREF="pam.html#AEN1801"
+>12.1. <A
+HREF="pam.html#AEN1788"
 >Samba and PAM</A
 ></DT
 ><DT
->13.2. <A
-HREF="pam.html#AEN1845"
+>12.2. <A
+HREF="pam.html#AEN1832"
 >Distributed Authentication</A
 ></DT
 ><DT
->13.3. <A
-HREF="pam.html#AEN1852"
+>12.3. <A
+HREF="pam.html#AEN1839"
 >PAM Configuration in smb.conf</A
 ></DT
 ></DL
 ></DD
 ><DT
->14. <A
+>13. <A
 HREF="msdfs.html"
 >Hosting a Microsoft Distributed File System tree on Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.1. <A
-HREF="msdfs.html#AEN1872"
+>13.1. <A
+HREF="msdfs.html#AEN1859"
 >Instructions</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.1.1. <A
-HREF="msdfs.html#AEN1907"
+>13.1.1. <A
+HREF="msdfs.html#AEN1894"
 >Notes</A
 ></DT
 ></DL
@@ -328,130 +325,130 @@ HREF="msdfs.html#AEN1907"
 ></DL
 ></DD
 ><DT
->15. <A
+>14. <A
 HREF="printing.html"
 >Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.1. <A
-HREF="printing.html#AEN1933"
+>14.1. <A
+HREF="printing.html#AEN1920"
 >Introduction</A
 ></DT
 ><DT
->15.2. <A
-HREF="printing.html#AEN1955"
+>14.2. <A
+HREF="printing.html#AEN1942"
 >Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.2.1. <A
-HREF="printing.html#AEN1963"
+>14.2.1. <A
+HREF="printing.html#AEN1950"
 >Creating [print$]</A
 ></DT
 ><DT
->15.2.2. <A
-HREF="printing.html#AEN1998"
+>14.2.2. <A
+HREF="printing.html#AEN1985"
 >Setting Drivers for Existing Printers</A
 ></DT
 ><DT
->15.2.3. <A
-HREF="printing.html#AEN2014"
+>14.2.3. <A
+HREF="printing.html#AEN2001"
 >Support a large number of printers</A
 ></DT
 ><DT
->15.2.4. <A
-HREF="printing.html#AEN2025"
+>14.2.4. <A
+HREF="printing.html#AEN2012"
 >Adding New Printers via the Windows NT APW</A
 ></DT
 ><DT
->15.2.5. <A
-HREF="printing.html#AEN2055"
+>14.2.5. <A
+HREF="printing.html#AEN2042"
 >Samba and Printer Ports</A
 ></DT
 ></DL
 ></DD
 ><DT
->15.3. <A
-HREF="printing.html#AEN2063"
+>14.3. <A
+HREF="printing.html#AEN2050"
 >The Imprints Toolset</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.3.1. <A
-HREF="printing.html#AEN2067"
+>14.3.1. <A
+HREF="printing.html#AEN2054"
 >What is Imprints?</A
 ></DT
 ><DT
->15.3.2. <A
-HREF="printing.html#AEN2077"
+>14.3.2. <A
+HREF="printing.html#AEN2064"
 >Creating Printer Driver Packages</A
 ></DT
 ><DT
->15.3.3. <A
-HREF="printing.html#AEN2080"
+>14.3.3. <A
+HREF="printing.html#AEN2067"
 >The Imprints server</A
 ></DT
 ><DT
->15.3.4. <A
-HREF="printing.html#AEN2084"
+>14.3.4. <A
+HREF="printing.html#AEN2071"
 >The Installation Client</A
 ></DT
 ></DL
 ></DD
 ><DT
->15.4. <A
-HREF="printing.html#AEN2106"
+>14.4. <A
+HREF="printing.html#AEN2093"
 >Diagnosis</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.4.1. <A
-HREF="printing.html#AEN2108"
+>14.4.1. <A
+HREF="printing.html#AEN2095"
 >Introduction</A
 ></DT
 ><DT
->15.4.2. <A
-HREF="printing.html#AEN2124"
+>14.4.2. <A
+HREF="printing.html#AEN2111"
 >Debugging printer problems</A
 ></DT
 ><DT
->15.4.3. <A
-HREF="printing.html#AEN2133"
+>14.4.3. <A
+HREF="printing.html#AEN2120"
 >What printers do I have?</A
 ></DT
 ><DT
->15.4.4. <A
-HREF="printing.html#AEN2141"
+>14.4.4. <A
+HREF="printing.html#AEN2128"
 >Setting up printcap and print servers</A
 ></DT
 ><DT
->15.4.5. <A
-HREF="printing.html#AEN2169"
+>14.4.5. <A
+HREF="printing.html#AEN2156"
 >Job sent, no output</A
 ></DT
 ><DT
->15.4.6. <A
-HREF="printing.html#AEN2180"
+>14.4.6. <A
+HREF="printing.html#AEN2167"
 >Job sent, strange output</A
 ></DT
 ><DT
->15.4.7. <A
-HREF="printing.html#AEN2192"
+>14.4.7. <A
+HREF="printing.html#AEN2179"
 >Raw PostScript printed</A
 ></DT
 ><DT
->15.4.8. <A
-HREF="printing.html#AEN2195"
+>14.4.8. <A
+HREF="printing.html#AEN2182"
 >Advanced Printing</A
 ></DT
 ><DT
->15.4.9. <A
-HREF="printing.html#AEN2198"
+>14.4.9. <A
+HREF="printing.html#AEN2185"
 >Real debugging</A
 ></DT
 ></DL
@@ -459,205 +456,205 @@ HREF="printing.html#AEN2198"
 ></DL
 ></DD
 ><DT
->16. <A
+>15. <A
 HREF="winbind.html"
 >Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.1. <A
-HREF="winbind.html#AEN2238"
+>15.1. <A
+HREF="winbind.html#AEN2225"
 >Abstract</A
 ></DT
 ><DT
->16.2. <A
-HREF="winbind.html#AEN2242"
+>15.2. <A
+HREF="winbind.html#AEN2229"
 >Introduction</A
 ></DT
 ><DT
->16.3. <A
-HREF="winbind.html#AEN2255"
+>15.3. <A
+HREF="winbind.html#AEN2242"
 >What Winbind Provides</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.3.1. <A
-HREF="winbind.html#AEN2262"
+>15.3.1. <A
+HREF="winbind.html#AEN2249"
 >Target Uses</A
 ></DT
 ></DL
 ></DD
 ><DT
->16.4. <A
-HREF="winbind.html#AEN2266"
+>15.4. <A
+HREF="winbind.html#AEN2253"
 >How Winbind Works</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.4.1. <A
-HREF="winbind.html#AEN2271"
+>15.4.1. <A
+HREF="winbind.html#AEN2258"
 >Microsoft Remote Procedure Calls</A
 ></DT
 ><DT
->16.4.2. <A
-HREF="winbind.html#AEN2275"
+>15.4.2. <A
+HREF="winbind.html#AEN2262"
 >Name Service Switch</A
 ></DT
 ><DT
->16.4.3. <A
-HREF="winbind.html#AEN2291"
+>15.4.3. <A
+HREF="winbind.html#AEN2278"
 >Pluggable Authentication Modules</A
 ></DT
 ><DT
->16.4.4. <A
-HREF="winbind.html#AEN2299"
+>15.4.4. <A
+HREF="winbind.html#AEN2286"
 >User and Group ID Allocation</A
 ></DT
 ><DT
->16.4.5. <A
-HREF="winbind.html#AEN2303"
+>15.4.5. <A
+HREF="winbind.html#AEN2290"
 >Result Caching</A
 ></DT
 ></DL
 ></DD
 ><DT
->16.5. <A
-HREF="winbind.html#AEN2306"
+>15.5. <A
+HREF="winbind.html#AEN2293"
 >Installation and Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.5.1. <A
-HREF="winbind.html#AEN2313"
+>15.5.1. <A
+HREF="winbind.html#AEN2300"
 >Introduction</A
 ></DT
 ><DT
->16.5.2. <A
-HREF="winbind.html#AEN2326"
+>15.5.2. <A
+HREF="winbind.html#AEN2313"
 >Requirements</A
 ></DT
 ><DT
->16.5.3. <A
-HREF="winbind.html#AEN2340"
+>15.5.3. <A
+HREF="winbind.html#AEN2327"
 >Testing Things Out</A
 ></DT
 ></DL
 ></DD
 ><DT
->16.6. <A
-HREF="winbind.html#AEN2555"
+>15.6. <A
+HREF="winbind.html#AEN2542"
 >Limitations</A
 ></DT
 ><DT
->16.7. <A
-HREF="winbind.html#AEN2565"
+>15.7. <A
+HREF="winbind.html#AEN2552"
 >Conclusion</A
 ></DT
 ></DL
 ></DD
 ><DT
->17. <A
+>16. <A
 HREF="pdb-mysql.html"
 >Passdb MySQL plugin</A
 ></DT
 ><DD
 ><DL
 ><DT
->17.1. <A
-HREF="pdb-mysql.html#AEN2579"
+>16.1. <A
+HREF="pdb-mysql.html#AEN2566"
 >Building</A
 ></DT
 ><DT
->17.2. <A
-HREF="pdb-mysql.html#AEN2585"
+>16.2. <A
+HREF="pdb-mysql.html#AEN2572"
 >Configuring</A
 ></DT
 ><DT
->17.3. <A
-HREF="pdb-mysql.html#AEN2600"
+>16.3. <A
+HREF="pdb-mysql.html#AEN2589"
 >Using plaintext passwords or encrypted password</A
 ></DT
 ><DT
->17.4. <A
-HREF="pdb-mysql.html#AEN2605"
+>16.4. <A
+HREF="pdb-mysql.html#AEN2594"
 >Getting non-column data from the table</A
 ></DT
 ></DL
 ></DD
 ><DT
->18. <A
+>17. <A
 HREF="pdb-xml.html"
 >Passdb XML plugin</A
 ></DT
 ><DD
 ><DL
 ><DT
->18.1. <A
-HREF="pdb-xml.html#AEN2624"
+>17.1. <A
+HREF="pdb-xml.html#AEN2613"
 >Building</A
 ></DT
 ><DT
->18.2. <A
-HREF="pdb-xml.html#AEN2630"
+>17.2. <A
+HREF="pdb-xml.html#AEN2619"
 >Usage</A
 ></DT
 ></DL
 ></DD
 ><DT
->19. <A
+>18. <A
 HREF="vfs.html"
 >Stackable VFS modules</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.1. <A
-HREF="vfs.html#AEN2651"
+>18.1. <A
+HREF="vfs.html#AEN2640"
 >Introduction and configuration</A
 ></DT
 ><DT
->19.2. <A
-HREF="vfs.html#AEN2659"
+>18.2. <A
+HREF="vfs.html#AEN2649"
 >Included modules</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.2.1. <A
-HREF="vfs.html#AEN2661"
+>18.2.1. <A
+HREF="vfs.html#AEN2651"
 >audit</A
 ></DT
 ><DT
->19.2.2. <A
-HREF="vfs.html#AEN2669"
+>18.2.2. <A
+HREF="vfs.html#AEN2659"
 >recycle</A
 ></DT
 ><DT
->19.2.3. <A
-HREF="vfs.html#AEN2706"
+>18.2.3. <A
+HREF="vfs.html#AEN2696"
 >netatalk</A
 ></DT
 ></DL
 ></DD
 ><DT
->19.3. <A
-HREF="vfs.html#AEN2713"
+>18.3. <A
+HREF="vfs.html#AEN2703"
 >VFS modules available elsewhere</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.3.1. <A
-HREF="vfs.html#AEN2717"
+>18.3.1. <A
+HREF="vfs.html#AEN2707"
 >DatabaseFS</A
 ></DT
 ><DT
->19.3.2. <A
-HREF="vfs.html#AEN2725"
+>18.3.2. <A
+HREF="vfs.html#AEN2715"
 >vscan</A
 ></DT
 ></DL
@@ -665,105 +662,105 @@ HREF="vfs.html#AEN2725"
 ></DL
 ></DD
 ><DT
->20. <A
+>19. <A
 HREF="samba-ldap-howto.html"
 >Storing Samba's User/Machine Account information in an LDAP Directory</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.1. <A
-HREF="samba-ldap-howto.html#AEN2747"
+>19.1. <A
+HREF="samba-ldap-howto.html#AEN2737"
 >Purpose</A
 ></DT
 ><DT
->20.2. <A
-HREF="samba-ldap-howto.html#AEN2767"
+>19.2. <A
+HREF="samba-ldap-howto.html#AEN2757"
 >Introduction</A
 ></DT
 ><DT
->20.3. <A
-HREF="samba-ldap-howto.html#AEN2796"
+>19.3. <A
+HREF="samba-ldap-howto.html#AEN2786"
 >Supported LDAP Servers</A
 ></DT
 ><DT
->20.4. <A
-HREF="samba-ldap-howto.html#AEN2801"
+>19.4. <A
+HREF="samba-ldap-howto.html#AEN2791"
 >Schema and Relationship to the RFC 2307 posixAccount</A
 ></DT
 ><DT
->20.5. <A
-HREF="samba-ldap-howto.html#AEN2813"
+>19.5. <A
+HREF="samba-ldap-howto.html#AEN2803"
 >Configuring Samba with LDAP</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.5.1. <A
-HREF="samba-ldap-howto.html#AEN2815"
+>19.5.1. <A
+HREF="samba-ldap-howto.html#AEN2805"
 >OpenLDAP configuration</A
 ></DT
 ><DT
->20.5.2. <A
-HREF="samba-ldap-howto.html#AEN2832"
+>19.5.2. <A
+HREF="samba-ldap-howto.html#AEN2822"
 >Configuring Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->20.6. <A
-HREF="samba-ldap-howto.html#AEN2860"
+>19.6. <A
+HREF="samba-ldap-howto.html#AEN2850"
 >Accounts and Groups management</A
 ></DT
 ><DT
->20.7. <A
-HREF="samba-ldap-howto.html#AEN2865"
+>19.7. <A
+HREF="samba-ldap-howto.html#AEN2855"
 >Security and sambaAccount</A
 ></DT
 ><DT
->20.8. <A
-HREF="samba-ldap-howto.html#AEN2885"
+>19.8. <A
+HREF="samba-ldap-howto.html#AEN2875"
 >LDAP specials attributes for sambaAccounts</A
 ></DT
 ><DT
->20.9. <A
-HREF="samba-ldap-howto.html#AEN2955"
+>19.9. <A
+HREF="samba-ldap-howto.html#AEN2945"
 >Example LDIF Entries for a sambaAccount</A
 ></DT
 ><DT
->20.10. <A
-HREF="samba-ldap-howto.html#AEN2963"
+>19.10. <A
+HREF="samba-ldap-howto.html#AEN2953"
 >Comments</A
 ></DT
 ></DL
 ></DD
 ><DT
->21. <A
+>20. <A
 HREF="cvs-access.html"
 >HOWTO Access Samba source code via CVS</A
 ></DT
 ><DD
 ><DL
 ><DT
->21.1. <A
-HREF="cvs-access.html#AEN2974"
+>20.1. <A
+HREF="cvs-access.html#AEN2964"
 >Introduction</A
 ></DT
 ><DT
->21.2. <A
-HREF="cvs-access.html#AEN2979"
+>20.2. <A
+HREF="cvs-access.html#AEN2969"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
->21.2.1. <A
-HREF="cvs-access.html#AEN2982"
+>20.2.1. <A
+HREF="cvs-access.html#AEN2972"
 >Access via CVSweb</A
 ></DT
 ><DT
->21.2.2. <A
-HREF="cvs-access.html#AEN2987"
+>20.2.2. <A
+HREF="cvs-access.html#AEN2977"
 >Access via cvs</A
 ></DT
 ></DL
@@ -771,121 +768,67 @@ HREF="cvs-access.html#AEN2987"
 ></DL
 ></DD
 ><DT
->22. <A
+>21. <A
 HREF="groupmapping.html"
 >Group mapping HOWTO</A
 ></DT
 ><DT
->23. <A
+>22. <A
 HREF="speed.html"
 >Samba performance issues</A
 ></DT
 ><DD
 ><DL
 ><DT
->23.1. <A
-HREF="speed.html#AEN3065"
+>22.1. <A
+HREF="speed.html#AEN3055"
 >Comparisons</A
 ></DT
 ><DT
->23.2. <A
-HREF="speed.html#AEN3071"
->Oplocks</A
-></DT
-><DD
-><DL
-><DT
->23.2.1. <A
-HREF="speed.html#AEN3073"
->Overview</A
-></DT
-><DT
->23.2.2. <A
-HREF="speed.html#AEN3081"
->Level2 Oplocks</A
-></DT
-><DT
->23.2.3. <A
-HREF="speed.html#AEN3087"
->Old 'fake oplocks' option - deprecated</A
-></DT
-></DL
-></DD
-><DT
->23.3. <A
-HREF="speed.html#AEN3091"
+>22.2. <A
+HREF="speed.html#AEN3061"
 >Socket options</A
 ></DT
 ><DT
->23.4. <A
-HREF="speed.html#AEN3098"
+>22.3. <A
+HREF="speed.html#AEN3068"
 >Read size</A
 ></DT
 ><DT
->23.5. <A
-HREF="speed.html#AEN3103"
+>22.4. <A
+HREF="speed.html#AEN3073"
 >Max xmit</A
 ></DT
 ><DT
->23.6. <A
-HREF="speed.html#AEN3108"
->Locking</A
-></DT
-><DT
->23.7. <A
-HREF="speed.html#AEN3112"
->Share modes</A
-></DT
-><DT
->23.8. <A
-HREF="speed.html#AEN3117"
+>22.5. <A
+HREF="speed.html#AEN3078"
 >Log level</A
 ></DT
 ><DT
->23.9. <A
-HREF="speed.html#AEN3120"
->Wide lines</A
-></DT
-><DT
->23.10. <A
-HREF="speed.html#AEN3123"
+>22.6. <A
+HREF="speed.html#AEN3081"
 >Read raw</A
 ></DT
 ><DT
->23.11. <A
-HREF="speed.html#AEN3128"
+>22.7. <A
+HREF="speed.html#AEN3086"
 >Write raw</A
 ></DT
 ><DT
->23.12. <A
-HREF="speed.html#AEN3132"
->Read prediction</A
-></DT
-><DT
->23.13. <A
-HREF="speed.html#AEN3139"
->Memory mapping</A
-></DT
-><DT
->23.14. <A
-HREF="speed.html#AEN3144"
+>22.8. <A
+HREF="speed.html#AEN3090"
 >Slow Clients</A
 ></DT
 ><DT
->23.15. <A
-HREF="speed.html#AEN3148"
+>22.9. <A
+HREF="speed.html#AEN3094"
 >Slow Logins</A
 ></DT
 ><DT
->23.16. <A
-HREF="speed.html#AEN3151"
+>22.10. <A
+HREF="speed.html#AEN3097"
 >Client tuning</A
 ></DT
-><DT
->23.17. <A
-HREF="speed.html#AEN3183"
->My Results</A
-></DT
 ></DL
 ></DD
 ></DL
diff --git a/docs/htmldocs/other-clients.html b/docs/htmldocs/other-clients.html
index 892509a591..130c9691e7 100644
--- a/docs/htmldocs/other-clients.html
+++ b/docs/htmldocs/other-clients.html
@@ -5,7 +5,8 @@
 >Samba and other CIFS clients</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,9 +73,7 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="OTHER-CLIENTS"
-></A
->Chapter 25. Samba and other CIFS clients</H1
+NAME="OTHER-CLIENTS">Chapter 24. Samba and other CIFS clients</H1
 ><P
 >This chapter contains client-specific information.</P
 ><DIV
@@ -82,9 +81,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3258"
-></A
->25.1. Macintosh clients?</H1
+NAME="AEN3199">24.1. Macintosh clients?</H1
 ><P
 >Yes. <A
 HREF="http://www.thursby.com/"
@@ -128,17 +125,13 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3267"
-></A
->25.2. OS2 Client</H1
+NAME="AEN3208">24.2. OS2 Client</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3269"
-></A
->25.2.1. How can I configure OS/2 Warp Connect or 
+NAME="AEN3210">24.2.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</H2
 ><P
 >A more complete answer to this question can be 
@@ -195,9 +188,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3284"
-></A
->25.2.2. How can I configure OS/2 Warp 3 (not Connect), 
+NAME="AEN3225">24.2.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</H2
 ><P
 >You can use the free Microsoft LAN Manager 2.2c Client 
@@ -239,9 +230,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3293"
-></A
->25.2.3. Are there any other issues when OS/2 (any version) 
+NAME="AEN3234">24.2.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</H2
 ><P
 >When you do a NET VIEW or use the "File and Print 
@@ -261,9 +250,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3297"
-></A
->25.2.4. How do I get printer driver download working 
+NAME="AEN3238">24.2.4. How do I get printer driver download working 
 		for OS/2 clients?</H2
 ><P
 >First, create a share called [PRINTDRV] that is 
@@ -312,17 +299,13 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3307"
-></A
->25.3. Windows for Workgroups</H1
+NAME="AEN3248">24.3. Windows for Workgroups</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3309"
-></A
->25.3.1. Use latest TCP/IP stack from Microsoft</H2
+NAME="AEN3250">24.3.1. Use latest TCP/IP stack from Microsoft</H2
 ><P
 >Use the latest TCP/IP stack from microsoft if you use Windows
 for workgroups.</P
@@ -342,9 +325,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3314"
-></A
->25.3.2. Delete .pwl files after password change</H2
+NAME="AEN3255">24.3.2. Delete .pwl files after password change</H2
 ><P
 >WfWg does a lousy job with passwords. I find that if I change my
 password on either the unix box or the PC the safest thing to do is to
@@ -362,9 +343,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3319"
-></A
->25.3.3. Configure WfW password handling</H2
+NAME="AEN3260">24.3.3. Configure WfW password handling</H2
 ><P
 >There is a program call admincfg.exe
 on the last disk (disk 8) of the WFW 3.11 disk set.  To install it
@@ -381,9 +360,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN3323"
-></A
->25.3.4. Case handling of passwords</H2
+NAME="AEN3264">24.3.4. Case handling of passwords</H2
 ><P
 >Windows for Workgroups uppercases the password before sending it to the server. Unix passwords can be case-sensitive though. Check the <A
 HREF="smb.conf.5.html"
@@ -400,9 +377,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3328"
-></A
->25.4. Windows '95/'98</H1
+NAME="AEN3269">24.4. Windows '95/'98</H1
 ><P
 >When using Windows 95 OEM SR2 the following updates are recommended where Samba
 is being used. Please NOTE that the above change will affect you once these
@@ -448,9 +423,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3344"
-></A
->25.5. Windows 2000 Service Pack 2</H1
+NAME="AEN3285">24.5. Windows 2000 Service Pack 2</H1
 ><P
 > 
 There are several annoyances with Windows 2000 SP2. One of which
diff --git a/docs/htmldocs/pam.html b/docs/htmldocs/pam.html
index 30b49b6944..ba2bf6c922 100644
--- a/docs/htmldocs/pam.html
+++ b/docs/htmldocs/pam.html
@@ -6,7 +6,8 @@
 managed authentication</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -73,18 +74,14 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="PAM"
-></A
->Chapter 13. Configuring PAM for distributed but centrally 
+NAME="PAM">Chapter 12. Configuring PAM for distributed but centrally 
 managed authentication</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1801"
-></A
->13.1. Samba and PAM</H1
+NAME="AEN1788">12.1. Samba and PAM</H1
 ><P
 >A number of Unix systems (eg: Sun Solaris), as well as the 
 xxxxBSD family and Linux, now utilize the Pluggable Authentication 
@@ -296,9 +293,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1845"
-></A
->13.2. Distributed Authentication</H1
+NAME="AEN1832">12.2. Distributed Authentication</H1
 ><P
 >The astute administrator will realize from this that the 
 combination of <TT
@@ -329,9 +324,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1852"
-></A
->13.3. PAM Configuration in smb.conf</H1
+NAME="AEN1839">12.3. PAM Configuration in smb.conf</H1
 ><P
 >There is an option in smb.conf called <A
 HREF="smb.conf.5.html#OBEYPAMRESTRICTIONS"
diff --git a/docs/htmldocs/pdb-mysql.html b/docs/htmldocs/pdb-mysql.html
index fc5dff85f5..abca946f6f 100644
--- a/docs/htmldocs/pdb-mysql.html
+++ b/docs/htmldocs/pdb-mysql.html
@@ -5,7 +5,8 @@
 >Passdb MySQL plugin</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="PDB-MYSQL"
-></A
->Chapter 17. Passdb MySQL plugin</H1
+NAME="PDB-MYSQL">Chapter 16. Passdb MySQL plugin</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2579"
-></A
->17.1. Building</H1
+NAME="AEN2566">16.1. Building</H1
 ><P
 >To build the plugin, run <B
 CLASS="COMMAND"
@@ -101,9 +98,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2585"
-></A
->17.2. Configuring</H1
+NAME="AEN2572">16.2. Configuring</H1
 ><P
 >This plugin lacks some good documentation, but here is some short info:</P
 ><P
@@ -136,6 +131,17 @@ identifier:mysql port                     - defaults to 3306
 identifier:table                          - Name of the table containing users</PRE
 ></P
 ><P
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>WARNING: since the password for the mysql user is stored in the 
+smb.conf file, you should make the the smb.conf file 
+readable only to the user that runs samba. This is considered a security 
+bug and will be fixed soon.</I
+></SPAN
+></P
+><P
 >Names of the columns in this table(I've added column types those columns should have first):</P
 ><P
 ><PRE
@@ -183,9 +189,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2600"
-></A
->17.3. Using plaintext passwords or encrypted password</H1
+NAME="AEN2589">16.3. Using plaintext passwords or encrypted password</H1
 ><P
 >I strongly discourage the use of plaintext passwords, however, you can use them:</P
 ><P
@@ -198,9 +202,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2605"
-></A
->17.4. Getting non-column data from the table</H1
+NAME="AEN2594">16.4. Getting non-column data from the table</H1
 ><P
 >It is possible to have not all data in the database and making some 'constant'.</P
 ><P
diff --git a/docs/htmldocs/pdb-xml.html b/docs/htmldocs/pdb-xml.html
index 221e51d5b7..4d300d7be0 100644
--- a/docs/htmldocs/pdb-xml.html
+++ b/docs/htmldocs/pdb-xml.html
@@ -5,7 +5,8 @@
 >Passdb XML plugin</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="PDB-XML"
-></A
->Chapter 18. Passdb XML plugin</H1
+NAME="PDB-XML">Chapter 17. Passdb XML plugin</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2624"
-></A
->18.1. Building</H1
+NAME="AEN2613">17.1. Building</H1
 ><P
 >This module requires libxml2 to be installed.</P
 ><P
@@ -100,9 +97,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2630"
-></A
->18.2. Usage</H1
+NAME="AEN2619">17.2. Usage</H1
 ><P
 >The usage of pdb_xml is pretty straightforward. To export data, use:
 
diff --git a/docs/htmldocs/portability.html b/docs/htmldocs/portability.html
index 25c24a3a2c..424fbe5c6c 100644
--- a/docs/htmldocs/portability.html
+++ b/docs/htmldocs/portability.html
@@ -5,7 +5,8 @@
 >Portability</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,9 +73,7 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="PORTABILITY"
-></A
->Chapter 24. Portability</H1
+NAME="PORTABILITY">Chapter 23. 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,9 +83,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3198"
-></A
->24.1. HPUX</H1
+NAME="AEN3139">23.1. HPUX</H1
 ><P
 >HP's implementation of supplementary groups is, er, non-standard (for
 hysterical reasons).  There are two group files, /etc/group and
@@ -114,9 +111,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3204"
-></A
->24.2. SCO Unix</H1
+NAME="AEN3145">23.2. SCO Unix</H1
 ><P
 > 
 If you run an old version of  SCO Unix then you may need to get important 
@@ -131,9 +126,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3208"
-></A
->24.3. DNIX</H1
+NAME="AEN3149">23.3. DNIX</H1
 ><P
 >DNIX has a problem with seteuid() and setegid(). These routines are
 needed for Samba to work correctly, but they were left out of the DNIX
@@ -238,9 +231,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3237"
-></A
->24.4. RedHat Linux Rembrandt-II</H1
+NAME="AEN3178">23.4. RedHat Linux Rembrandt-II</H1
 ><P
 >By default RedHat Rembrandt-II during installation adds an
 entry to /etc/hosts as follows:
diff --git a/docs/htmldocs/printing.html b/docs/htmldocs/printing.html
index b2b893afec..46ebbcdf84 100644
--- a/docs/htmldocs/printing.html
+++ b/docs/htmldocs/printing.html
@@ -5,7 +5,8 @@
 >Printing Support</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="PRINTING"
-></A
->Chapter 15. Printing Support</H1
+NAME="PRINTING">Chapter 14. Printing Support</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1933"
-></A
->15.1. Introduction</H1
+NAME="AEN1920">14.1. Introduction</H1
 ><P
 >Beginning with the 2.2.0 release, Samba supports 
 the native Windows NT printing mechanisms implemented via 
@@ -163,9 +160,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1955"
-></A
->15.2. Configuration</H1
+NAME="AEN1942">14.2. Configuration</H1
 ><DIV
 CLASS="WARNING"
 ><P
@@ -180,7 +175,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TH
@@ -229,9 +224,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1963"
-></A
->15.2.1. Creating [print$]</H2
+NAME="AEN1950">14.2.1. Creating [print$]</H2
 ><P
 >In order to support the uploading of printer driver 
 files, you must first configure a file share named [print$].  
@@ -310,7 +303,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TH
@@ -381,7 +374,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TH
@@ -452,9 +445,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1998"
-></A
->15.2.2. Setting Drivers for Existing Printers</H2
+NAME="AEN1985">14.2.2. Setting Drivers for Existing Printers</H2
 ><P
 >The initial listing of printers in the Samba host's 
 Printers folder will have no real printer driver assigned 
@@ -524,9 +515,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2014"
-></A
->15.2.3. Support a large number of printers</H2
+NAME="AEN2001">14.2.3. Support a large number of printers</H2
 ><P
 >One issue that has arisen during the development
 phase of Samba 2.2 is the need to support driver downloads for
@@ -590,9 +579,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2025"
-></A
->15.2.4. Adding New Printers via the Windows NT APW</H2
+NAME="AEN2012">14.2.4. Adding New Printers via the Windows NT APW</H2
 ><P
 >By default, Samba offers all printer shares defined in <TT
 CLASS="FILENAME"
@@ -759,9 +746,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2055"
-></A
->15.2.5. Samba and Printer Ports</H2
+NAME="AEN2042">14.2.5. Samba and Printer Ports</H2
 ><P
 >Windows NT/2000 print servers associate a port with each printer.  These normally
 take the form of LPT1:, COM1:, FILE:, etc...  Samba must also support the
@@ -796,9 +781,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2063"
-></A
->15.3. The Imprints Toolset</H1
+NAME="AEN2050">14.3. The Imprints Toolset</H1
 ><P
 >The Imprints tool set provides a UNIX equivalent of the 
 	Windows NT Add Printer Wizard.  For complete information, please 
@@ -814,9 +797,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2067"
-></A
->15.3.1. What is Imprints?</H2
+NAME="AEN2054">14.3.1. What is Imprints?</H2
 ><P
 >Imprints is a collection of tools for supporting the goals 
 		of</P
@@ -846,9 +827,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2077"
-></A
->15.3.2. Creating Printer Driver Packages</H2
+NAME="AEN2064">14.3.2. Creating Printer Driver Packages</H2
 ><P
 >The process of creating printer driver packages is beyond
 		the scope of this document (refer to Imprints.txt also included
@@ -862,9 +841,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2080"
-></A
->15.3.3. The Imprints server</H2
+NAME="AEN2067">14.3.3. The Imprints server</H2
 ><P
 >The Imprints server is really a database server that 
 		may be queried via standard HTTP mechanisms.  Each printer 
@@ -886,9 +863,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2084"
-></A
->15.3.4. The Installation Client</H2
+NAME="AEN2071">14.3.4. The Installation Client</H2
 ><P
 >More information regarding the Imprints installation client 
 		is available in the <TT
@@ -980,17 +955,13 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2106"
-></A
->15.4. Diagnosis</H1
+NAME="AEN2093">14.4. Diagnosis</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2108"
-></A
->15.4.1. Introduction</H2
+NAME="AEN2095">14.4.1. Introduction</H2
 ><P
 >This is a short description of how to debug printing problems with
 Samba. This describes how to debug problems with printing from a SMB
@@ -1063,9 +1034,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2124"
-></A
->15.4.2. Debugging printer problems</H2
+NAME="AEN2111">14.4.2. Debugging printer problems</H2
 ><P
 >One way to debug printing problems is to start by replacing these
 command with shell scripts that record the arguments and the contents
@@ -1120,9 +1089,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2133"
-></A
->15.4.3. What printers do I have?</H2
+NAME="AEN2120">14.4.3. What printers do I have?</H2
 ><P
 >You can use the 'testprns' program to check to see if the printer
 name you are using is recognized by Samba.  For example,  you can
@@ -1149,9 +1116,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2141"
-></A
->15.4.4. Setting up printcap and print servers</H2
+NAME="AEN2128">14.4.4. Setting up printcap and print servers</H2
 ><P
 >You may need to set up some printcaps for your Samba system to use.
 It is strongly recommended that you use the facilities provided by
@@ -1233,9 +1198,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2169"
-></A
->15.4.5. Job sent, no output</H2
+NAME="AEN2156">14.4.5. Job sent, no output</H2
 ><P
 >This is the most frustrating part of printing.  You may have sent the
 job,  verified that the job was forwarded,  set up a wrapper around
@@ -1278,9 +1241,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2180"
-></A
->15.4.6. Job sent, strange output</H2
+NAME="AEN2167">14.4.6. Job sent, strange output</H2
 ><P
 >Once you have the job printing, you can then start worrying about
 making it print nicely.</P
@@ -1324,9 +1285,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2192"
-></A
->15.4.7. Raw PostScript printed</H2
+NAME="AEN2179">14.4.7. Raw PostScript printed</H2
 ><P
 >This is a problem that is usually caused by either the print spooling
 system putting information at the start of the print job that makes
@@ -1339,9 +1298,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2195"
-></A
->15.4.8. Advanced Printing</H2
+NAME="AEN2182">14.4.8. Advanced Printing</H2
 ><P
 >Note that you can do some pretty magic things by using your
 imagination with the "print command" option and some shell scripts.
@@ -1355,9 +1312,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2198"
-></A
->15.4.9. Real debugging</H2
+NAME="AEN2185">14.4.9. Real debugging</H2
 ><P
 >If the above debug tips don't help, then maybe you need to bring in
 the bug guns, system tracing. See Tracing.txt in this directory.</P
diff --git a/docs/htmldocs/pwencrypt.html b/docs/htmldocs/pwencrypt.html
index 0ce1bd037e..9414399bf4 100644
--- a/docs/htmldocs/pwencrypt.html
+++ b/docs/htmldocs/pwencrypt.html
@@ -5,7 +5,8 @@
 >LanMan and NT Password Encryption in Samba</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="PWENCRYPT"
-></A
->Chapter 5. LanMan and NT Password Encryption in Samba</H1
+NAME="PWENCRYPT">Chapter 4. LanMan and NT Password Encryption in Samba</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN473"
-></A
->5.1. Introduction</H1
+NAME="AEN457">4.1. Introduction</H1
 ><P
 >Newer windows clients send encrypted passwords over 
 	the wire, instead of plain text passwords. The newest clients 
@@ -104,9 +101,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN478"
-></A
->5.2. Important Notes About Security</H1
+NAME="AEN462">4.2. Important Notes About Security</H1
 ><P
 >The unix and SMB password encryption techniques seem similar 
 	on the surface. This similarity is, however, only skin deep. The unix 
@@ -140,7 +135,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TD
@@ -206,9 +201,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN497"
-></A
->5.2.1. Advantages of SMB Encryption</H2
+NAME="AEN481">4.2.1. Advantages of SMB Encryption</H2
 ><P
 ></P
 ><UL
@@ -235,9 +228,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN504"
-></A
->5.2.2. Advantages of non-encrypted passwords</H2
+NAME="AEN488">4.2.2. Advantages of non-encrypted passwords</H2
 ><P
 ></P
 ><UL
@@ -266,9 +257,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN513"
-></A
->5.3. The smbpasswd Command</H1
+NAME="AEN497">4.3. The smbpasswd Command</H1
 ><P
 >The smbpasswd command maintains the two 32 byte password fields 
 	in the smbpasswd file. If you wish to make it similar to the unix 
diff --git a/docs/htmldocs/samba-bdc.html b/docs/htmldocs/samba-bdc.html
index 85ec191a99..ef06a89416 100644
--- a/docs/htmldocs/samba-bdc.html
+++ b/docs/htmldocs/samba-bdc.html
@@ -5,7 +5,8 @@
 >How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="SAMBA-BDC"
-></A
->Chapter 8. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</H1
+NAME="SAMBA-BDC">Chapter 7. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1143"
-></A
->8.1. Prerequisite Reading</H1
+NAME="AEN1127">7.1. Prerequisite Reading</H1
 ><P
 >Before you continue reading in this chapter, please make sure
 that you are comfortable with configuring a Samba PDC
@@ -97,9 +94,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1147"
-></A
->8.2. Background</H1
+NAME="AEN1131">7.2. Background</H1
 ><P
 >What is a Domain Controller? It is a machine that is able to answer
 logon requests from workstations in a Windows NT Domain. Whenever a
@@ -142,9 +137,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1155"
-></A
->8.3. What qualifies a Domain Controller on the network?</H1
+NAME="AEN1139">7.3. What qualifies a Domain Controller on the network?</H1
 ><P
 >Every machine that is a Domain Controller for the domain SAMBA has to
 register the NetBIOS group name SAMBA#1c with the WINS server and/or
@@ -159,9 +152,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1158"
-></A
->8.3.1. How does a Workstation find its domain controller?</H2
+NAME="AEN1142">7.3.1. How does a Workstation find its domain controller?</H2
 ><P
 >A NT workstation in the domain SAMBA that wants a local user to be
 authenticated has to find the domain controller for SAMBA. It does
@@ -178,9 +169,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1161"
-></A
->8.3.2. When is the PDC needed?</H2
+NAME="AEN1145">7.3.2. When is the PDC needed?</H2
 ><P
 >Whenever a user wants to change his password, this has to be done on
 the PDC. To find the PDC, the workstation does a NetBIOS name query
@@ -194,9 +183,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1164"
-></A
->8.4. Can Samba be a Backup Domain Controller?</H1
+NAME="AEN1148">7.4. Can Samba be a Backup Domain Controller?</H1
 ><P
 >With version 2.2, no. The native NT SAM replication protocols have
 not yet been fully implemented. The Samba Team is working on
@@ -213,9 +200,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1168"
-></A
->8.5. How do I set up a Samba BDC?</H1
+NAME="AEN1152">7.5. How do I set up a Samba BDC?</H1
 ><P
 >Several things have to be done:</P
 ><P
@@ -280,9 +265,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1185"
-></A
->8.5.1. How do I replicate the smbpasswd file?</H2
+NAME="AEN1169">7.5.1. How do I replicate the smbpasswd file?</H2
 ><P
 >Replication of the smbpasswd file is sensitive. It has to be done
 whenever changes to the SAM are made. Every user's password change is
diff --git a/docs/htmldocs/samba-howto-collection.html b/docs/htmldocs/samba-howto-collection.html
index 8e7eb942b0..0062e257dc 100644
--- a/docs/htmldocs/samba-howto-collection.html
+++ b/docs/htmldocs/samba-howto-collection.html
@@ -5,7 +5,8 @@
 >SAMBA Project Documentation</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="NEXT"
 TITLE="General installation"
 HREF="introduction.html"></HEAD
@@ -19,28 +20,20 @@ ALINK="#0000FF"
 ><DIV
 CLASS="BOOK"
 ><A
-NAME="SAMBA-HOWTO-COLLECTION"
-></A
-><DIV
+NAME="SAMBA-HOWTO-COLLECTION"><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
 ><A
-NAME="SAMBA-HOWTO-COLLECTION"
-></A
->SAMBA Project Documentation</H1
+NAME="SAMBA-HOWTO-COLLECTION">SAMBA Project Documentation</H1
 ><H3
 CLASS="AUTHOR"
 ><A
-NAME="AEN4"
-></A
->SAMBA Team</H3
+NAME="AEN4">SAMBA Team</H3
 ><HR></DIV
 ><H1
 ><A
-NAME="AEN8"
-></A
->Abstract</H1
+NAME="AEN8">Abstract</H1
 ><P
 ><SPAN
 CLASS="emphasis"
@@ -48,7 +41,7 @@ CLASS="emphasis"
 CLASS="EMPHASIS"
 >Last Update</I
 ></SPAN
-> : $Date: 2003/01/15 22:29:23 $</P
+> : 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
@@ -223,77 +216,63 @@ HREF="improved-browsing.html#AEN366"
 ></DD
 ><DT
 >3. <A
-HREF="oplocks.html"
->Oplocks</A
-></DT
-><DD
-><DL
-><DT
->3.1. <A
-HREF="oplocks.html#AEN378"
->What are oplocks?</A
-></DT
-></DL
-></DD
-><DT
->4. <A
 HREF="browsing-quick.html"
 >Quick Cross Subnet Browsing / Cross Workgroup Browsing guide</A
 ></DT
 ><DD
 ><DL
 ><DT
->4.1. <A
-HREF="browsing-quick.html#AEN393"
+>3.1. <A
+HREF="browsing-quick.html#AEN377"
 >Discussion</A
 ></DT
 ><DT
->4.2. <A
-HREF="browsing-quick.html#AEN401"
+>3.2. <A
+HREF="browsing-quick.html#AEN385"
 >Use of the "Remote Announce" parameter</A
 ></DT
 ><DT
->4.3. <A
-HREF="browsing-quick.html#AEN415"
+>3.3. <A
+HREF="browsing-quick.html#AEN399"
 >Use of the "Remote Browse Sync" parameter</A
 ></DT
 ><DT
->4.4. <A
-HREF="browsing-quick.html#AEN420"
+>3.4. <A
+HREF="browsing-quick.html#AEN404"
 >Use of WINS</A
 ></DT
 ><DT
->4.5. <A
-HREF="browsing-quick.html#AEN431"
+>3.5. <A
+HREF="browsing-quick.html#AEN415"
 >Do NOT use more than one (1) protocol on MS Windows machines</A
 ></DT
 ><DT
->4.6. <A
-HREF="browsing-quick.html#AEN437"
+>3.6. <A
+HREF="browsing-quick.html#AEN421"
 >Name Resolution Order</A
 ></DT
 ></DL
 ></DD
 ><DT
->5. <A
+>4. <A
 HREF="pwencrypt.html"
 >LanMan and NT Password Encryption in Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->5.1. <A
-HREF="pwencrypt.html#AEN473"
+>4.1. <A
+HREF="pwencrypt.html#AEN457"
 >Introduction</A
 ></DT
 ><DT
->5.2. <A
-HREF="pwencrypt.html#AEN478"
+>4.2. <A
+HREF="pwencrypt.html#AEN462"
 >Important Notes About Security</A
 ></DT
 ><DT
->5.3. <A
-HREF="pwencrypt.html#AEN513"
+>4.3. <A
+HREF="pwencrypt.html#AEN497"
 >The smbpasswd Command</A
 ></DT
 ></DL
@@ -308,168 +287,168 @@ HREF="type.html"
 ><DD
 ><DL
 ><DT
->6. <A
+>5. <A
 HREF="securitylevels.html"
 >User and Share security level (for servers not in a domain)</A
 ></DT
 ><DT
->7. <A
+>6. <A
 HREF="samba-pdc.html"
 >How to Configure Samba as a NT4 Primary Domain Controller</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.1. <A
-HREF="samba-pdc.html#AEN591"
+>6.1. <A
+HREF="samba-pdc.html#AEN575"
 >Prerequisite Reading</A
 ></DT
 ><DT
->7.2. <A
-HREF="samba-pdc.html#AEN597"
+>6.2. <A
+HREF="samba-pdc.html#AEN581"
 >Background</A
 ></DT
 ><DT
->7.3. <A
-HREF="samba-pdc.html#AEN636"
+>6.3. <A
+HREF="samba-pdc.html#AEN620"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
->7.4. <A
-HREF="samba-pdc.html#AEN679"
+>6.4. <A
+HREF="samba-pdc.html#AEN663"
 >Creating Machine Trust Accounts and Joining Clients to the
 Domain</A
 ></DT
 ><DT
->7.5. <A
-HREF="samba-pdc.html#AEN763"
+>6.5. <A
+HREF="samba-pdc.html#AEN747"
 >Common Problems and Errors</A
 ></DT
 ><DT
->7.6. <A
-HREF="samba-pdc.html#AEN811"
+>6.6. <A
+HREF="samba-pdc.html#AEN795"
 >System Policies and Profiles</A
 ></DT
 ><DT
->7.7. <A
-HREF="samba-pdc.html#AEN855"
+>6.7. <A
+HREF="samba-pdc.html#AEN839"
 >What other help can I get?</A
 ></DT
 ><DT
->7.8. <A
-HREF="samba-pdc.html#AEN969"
+>6.8. <A
+HREF="samba-pdc.html#AEN953"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DT
->7.9. <A
-HREF="samba-pdc.html#AEN1107"
+>6.9. <A
+HREF="samba-pdc.html#AEN1091"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->8. <A
+>7. <A
 HREF="samba-bdc.html"
 >How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.1. <A
-HREF="samba-bdc.html#AEN1143"
+>7.1. <A
+HREF="samba-bdc.html#AEN1127"
 >Prerequisite Reading</A
 ></DT
 ><DT
->8.2. <A
-HREF="samba-bdc.html#AEN1147"
+>7.2. <A
+HREF="samba-bdc.html#AEN1131"
 >Background</A
 ></DT
 ><DT
->8.3. <A
-HREF="samba-bdc.html#AEN1155"
+>7.3. <A
+HREF="samba-bdc.html#AEN1139"
 >What qualifies a Domain Controller on the network?</A
 ></DT
 ><DT
->8.4. <A
-HREF="samba-bdc.html#AEN1164"
+>7.4. <A
+HREF="samba-bdc.html#AEN1148"
 >Can Samba be a Backup Domain Controller?</A
 ></DT
 ><DT
->8.5. <A
-HREF="samba-bdc.html#AEN1168"
+>7.5. <A
+HREF="samba-bdc.html#AEN1152"
 >How do I set up a Samba BDC?</A
 ></DT
 ></DL
 ></DD
 ><DT
->9. <A
+>8. <A
 HREF="ads.html"
 >Samba as a ADS domain member</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.1. <A
-HREF="ads.html#AEN1203"
+>8.1. <A
+HREF="ads.html#AEN1187"
 >Installing the required packages for Debian</A
 ></DT
 ><DT
->9.2. <A
-HREF="ads.html#AEN1209"
+>8.2. <A
+HREF="ads.html#AEN1193"
 >Installing the required packages for RedHat</A
 ></DT
 ><DT
->9.3. <A
-HREF="ads.html#AEN1218"
+>8.3. <A
+HREF="ads.html#AEN1202"
 >Compile Samba</A
 ></DT
 ><DT
->9.4. <A
-HREF="ads.html#AEN1230"
+>8.4. <A
+HREF="ads.html#AEN1217"
 >Setup your /etc/krb5.conf</A
 ></DT
 ><DT
->9.5. <A
-HREF="ads.html#AEN1240"
+>8.5. <A
+HREF="ads.html#AEN1227"
 >Create the computer account</A
 ></DT
 ><DT
->9.6. <A
-HREF="ads.html#AEN1256"
+>8.6. <A
+HREF="ads.html#AEN1243"
 >Test your server setup</A
 ></DT
 ><DT
->9.7. <A
-HREF="ads.html#AEN1261"
+>8.7. <A
+HREF="ads.html#AEN1248"
 >Testing with smbclient</A
 ></DT
 ><DT
->9.8. <A
-HREF="ads.html#AEN1264"
+>8.8. <A
+HREF="ads.html#AEN1251"
 >Notes</A
 ></DT
 ></DL
 ></DD
 ><DT
->10. <A
+>9. <A
 HREF="domain-security.html"
 >Samba as a NT4 domain member</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.1. <A
-HREF="domain-security.html#AEN1286"
+>9.1. <A
+HREF="domain-security.html#AEN1273"
 >Joining an NT Domain with Samba 2.2</A
 ></DT
 ><DT
->10.2. <A
-HREF="domain-security.html#AEN1350"
+>9.2. <A
+HREF="domain-security.html#AEN1337"
 >Samba and Windows 2000 Domains</A
 ></DT
 ><DT
->10.3. <A
-HREF="domain-security.html#AEN1355"
+>9.3. <A
+HREF="domain-security.html#AEN1342"
 >Why is this better than security = server?</A
 ></DT
 ></DL
@@ -484,95 +463,95 @@ HREF="optional.html"
 ><DD
 ><DL
 ><DT
->11. <A
+>10. <A
 HREF="integrate-ms-networks.html"
 >Integrating MS Windows networks with Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="integrate-ms-networks.html#AEN1387"
+>10.1. <A
+HREF="integrate-ms-networks.html#AEN1374"
 >Agenda</A
 ></DT
 ><DT
->11.2. <A
-HREF="integrate-ms-networks.html#AEN1409"
+>10.2. <A
+HREF="integrate-ms-networks.html#AEN1396"
 >Name Resolution in a pure Unix/Linux world</A
 ></DT
 ><DT
->11.3. <A
-HREF="integrate-ms-networks.html#AEN1472"
+>10.3. <A
+HREF="integrate-ms-networks.html#AEN1459"
 >Name resolution as used within MS Windows networking</A
 ></DT
 ><DT
->11.4. <A
-HREF="integrate-ms-networks.html#AEN1517"
+>10.4. <A
+HREF="integrate-ms-networks.html#AEN1504"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></DT
 ><DT
->11.5. <A
-HREF="integrate-ms-networks.html#AEN1527"
+>10.5. <A
+HREF="integrate-ms-networks.html#AEN1514"
 >MS Windows security options and how to configure 
 Samba for seemless integration</A
 ></DT
 ><DT
->11.6. <A
-HREF="integrate-ms-networks.html#AEN1597"
+>10.6. <A
+HREF="integrate-ms-networks.html#AEN1584"
 >Conclusions</A
 ></DT
 ></DL
 ></DD
 ><DT
->12. <A
+>11. <A
 HREF="unix-permissions.html"
 >UNIX Permission Bits and Windows NT Access Control Lists</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.1. <A
-HREF="unix-permissions.html#AEN1618"
+>11.1. <A
+HREF="unix-permissions.html#AEN1605"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
->12.2. <A
-HREF="unix-permissions.html#AEN1627"
+>11.2. <A
+HREF="unix-permissions.html#AEN1614"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
->12.3. <A
-HREF="unix-permissions.html#AEN1638"
+>11.3. <A
+HREF="unix-permissions.html#AEN1625"
 >Viewing file ownership</A
 ></DT
 ><DT
->12.4. <A
-HREF="unix-permissions.html#AEN1658"
+>11.4. <A
+HREF="unix-permissions.html#AEN1645"
 >Viewing file or directory permissions</A
 ></DT
 ><DT
->12.5. <A
-HREF="unix-permissions.html#AEN1694"
+>11.5. <A
+HREF="unix-permissions.html#AEN1681"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
->12.6. <A
-HREF="unix-permissions.html#AEN1716"
+>11.6. <A
+HREF="unix-permissions.html#AEN1703"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
->12.7. <A
-HREF="unix-permissions.html#AEN1780"
+>11.7. <A
+HREF="unix-permissions.html#AEN1767"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
 ></DL
 ></DD
 ><DT
->13. <A
+>12. <A
 HREF="pam.html"
 >Configuring PAM for distributed but centrally 
 managed authentication</A
@@ -580,356 +559,321 @@ managed authentication</A
 ><DD
 ><DL
 ><DT
->13.1. <A
-HREF="pam.html#AEN1801"
+>12.1. <A
+HREF="pam.html#AEN1788"
 >Samba and PAM</A
 ></DT
 ><DT
->13.2. <A
-HREF="pam.html#AEN1845"
+>12.2. <A
+HREF="pam.html#AEN1832"
 >Distributed Authentication</A
 ></DT
 ><DT
->13.3. <A
-HREF="pam.html#AEN1852"
+>12.3. <A
+HREF="pam.html#AEN1839"
 >PAM Configuration in smb.conf</A
 ></DT
 ></DL
 ></DD
 ><DT
->14. <A
+>13. <A
 HREF="msdfs.html"
 >Hosting a Microsoft Distributed File System tree on Samba</A
 ></DT
 ><DD
 ><DL
 ><DT
->14.1. <A
-HREF="msdfs.html#AEN1872"
+>13.1. <A
+HREF="msdfs.html#AEN1859"
 >Instructions</A
 ></DT
 ></DL
 ></DD
 ><DT
->15. <A
+>14. <A
 HREF="printing.html"
 >Printing Support</A
 ></DT
 ><DD
 ><DL
 ><DT
->15.1. <A
-HREF="printing.html#AEN1933"
+>14.1. <A
+HREF="printing.html#AEN1920"
 >Introduction</A
 ></DT
 ><DT
->15.2. <A
-HREF="printing.html#AEN1955"
+>14.2. <A
+HREF="printing.html#AEN1942"
 >Configuration</A
 ></DT
 ><DT
->15.3. <A
-HREF="printing.html#AEN2063"
+>14.3. <A
+HREF="printing.html#AEN2050"
 >The Imprints Toolset</A
 ></DT
 ><DT
->15.4. <A
-HREF="printing.html#AEN2106"
+>14.4. <A
+HREF="printing.html#AEN2093"
 >Diagnosis</A
 ></DT
 ></DL
 ></DD
 ><DT
->16. <A
+>15. <A
 HREF="winbind.html"
 >Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
 ><DT
->16.1. <A
-HREF="winbind.html#AEN2238"
+>15.1. <A
+HREF="winbind.html#AEN2225"
 >Abstract</A
 ></DT
 ><DT
->16.2. <A
-HREF="winbind.html#AEN2242"
+>15.2. <A
+HREF="winbind.html#AEN2229"
 >Introduction</A
 ></DT
 ><DT
->16.3. <A
-HREF="winbind.html#AEN2255"
+>15.3. <A
+HREF="winbind.html#AEN2242"
 >What Winbind Provides</A
 ></DT
 ><DT
->16.4. <A
-HREF="winbind.html#AEN2266"
+>15.4. <A
+HREF="winbind.html#AEN2253"
 >How Winbind Works</A
 ></DT
 ><DT
->16.5. <A
-HREF="winbind.html#AEN2306"
+>15.5. <A
+HREF="winbind.html#AEN2293"
 >Installation and Configuration</A
 ></DT
 ><DT
->16.6. <A
-HREF="winbind.html#AEN2555"
+>15.6. <A
+HREF="winbind.html#AEN2542"
 >Limitations</A
 ></DT
 ><DT
->16.7. <A
-HREF="winbind.html#AEN2565"
+>15.7. <A
+HREF="winbind.html#AEN2552"
 >Conclusion</A
 ></DT
 ></DL
 ></DD
 ><DT
->17. <A
+>16. <A
 HREF="pdb-mysql.html"
 >Passdb MySQL plugin</A
 ></DT
 ><DD
 ><DL
 ><DT
->17.1. <A
-HREF="pdb-mysql.html#AEN2579"
+>16.1. <A
+HREF="pdb-mysql.html#AEN2566"
 >Building</A
 ></DT
 ><DT
->17.2. <A
-HREF="pdb-mysql.html#AEN2585"
+>16.2. <A
+HREF="pdb-mysql.html#AEN2572"
 >Configuring</A
 ></DT
 ><DT
->17.3. <A
-HREF="pdb-mysql.html#AEN2600"
+>16.3. <A
+HREF="pdb-mysql.html#AEN2589"
 >Using plaintext passwords or encrypted password</A
 ></DT
 ><DT
->17.4. <A
-HREF="pdb-mysql.html#AEN2605"
+>16.4. <A
+HREF="pdb-mysql.html#AEN2594"
 >Getting non-column data from the table</A
 ></DT
 ></DL
 ></DD
 ><DT
->18. <A
+>17. <A
 HREF="pdb-xml.html"
 >Passdb XML plugin</A
 ></DT
 ><DD
 ><DL
 ><DT
->18.1. <A
-HREF="pdb-xml.html#AEN2624"
+>17.1. <A
+HREF="pdb-xml.html#AEN2613"
 >Building</A
 ></DT
 ><DT
->18.2. <A
-HREF="pdb-xml.html#AEN2630"
+>17.2. <A
+HREF="pdb-xml.html#AEN2619"
 >Usage</A
 ></DT
 ></DL
 ></DD
 ><DT
->19. <A
+>18. <A
 HREF="vfs.html"
 >Stackable VFS modules</A
 ></DT
 ><DD
 ><DL
 ><DT
->19.1. <A
-HREF="vfs.html#AEN2651"
+>18.1. <A
+HREF="vfs.html#AEN2640"
 >Introduction and configuration</A
 ></DT
 ><DT
->19.2. <A
-HREF="vfs.html#AEN2659"
+>18.2. <A
+HREF="vfs.html#AEN2649"
 >Included modules</A
 ></DT
 ><DT
->19.3. <A
-HREF="vfs.html#AEN2713"
+>18.3. <A
+HREF="vfs.html#AEN2703"
 >VFS modules available elsewhere</A
 ></DT
 ></DL
 ></DD
 ><DT
->20. <A
+>19. <A
 HREF="samba-ldap-howto.html"
 >Storing Samba's User/Machine Account information in an LDAP Directory</A
 ></DT
 ><DD
 ><DL
 ><DT
->20.1. <A
-HREF="samba-ldap-howto.html#AEN2747"
+>19.1. <A
+HREF="samba-ldap-howto.html#AEN2737"
 >Purpose</A
 ></DT
 ><DT
->20.2. <A
-HREF="samba-ldap-howto.html#AEN2767"
+>19.2. <A
+HREF="samba-ldap-howto.html#AEN2757"
 >Introduction</A
 ></DT
 ><DT
->20.3. <A
-HREF="samba-ldap-howto.html#AEN2796"
+>19.3. <A
+HREF="samba-ldap-howto.html#AEN2786"
 >Supported LDAP Servers</A
 ></DT
 ><DT
->20.4. <A
-HREF="samba-ldap-howto.html#AEN2801"
+>19.4. <A
+HREF="samba-ldap-howto.html#AEN2791"
 >Schema and Relationship to the RFC 2307 posixAccount</A
 ></DT
 ><DT
->20.5. <A
-HREF="samba-ldap-howto.html#AEN2813"
+>19.5. <A
+HREF="samba-ldap-howto.html#AEN2803"
 >Configuring Samba with LDAP</A
 ></DT
 ><DT
->20.6. <A
-HREF="samba-ldap-howto.html#AEN2860"
+>19.6. <A
+HREF="samba-ldap-howto.html#AEN2850"
 >Accounts and Groups management</A
 ></DT
 ><DT
->20.7. <A
-HREF="samba-ldap-howto.html#AEN2865"
+>19.7. <A
+HREF="samba-ldap-howto.html#AEN2855"
 >Security and sambaAccount</A
 ></DT
 ><DT
->20.8. <A
-HREF="samba-ldap-howto.html#AEN2885"
+>19.8. <A
+HREF="samba-ldap-howto.html#AEN2875"
 >LDAP specials attributes for sambaAccounts</A
 ></DT
 ><DT
->20.9. <A
-HREF="samba-ldap-howto.html#AEN2955"
+>19.9. <A
+HREF="samba-ldap-howto.html#AEN2945"
 >Example LDIF Entries for a sambaAccount</A
 ></DT
 ><DT
->20.10. <A
-HREF="samba-ldap-howto.html#AEN2963"
+>19.10. <A
+HREF="samba-ldap-howto.html#AEN2953"
 >Comments</A
 ></DT
 ></DL
 ></DD
 ><DT
->21. <A
+>20. <A
 HREF="cvs-access.html"
 >HOWTO Access Samba source code via CVS</A
 ></DT
 ><DD
 ><DL
 ><DT
->21.1. <A
-HREF="cvs-access.html#AEN2974"
+>20.1. <A
+HREF="cvs-access.html#AEN2964"
 >Introduction</A
 ></DT
 ><DT
->21.2. <A
-HREF="cvs-access.html#AEN2979"
+>20.2. <A
+HREF="cvs-access.html#AEN2969"
 >CVS Access to samba.org</A
 ></DT
 ></DL
 ></DD
 ><DT
->22. <A
+>21. <A
 HREF="groupmapping.html"
 >Group mapping HOWTO</A
 ></DT
 ><DT
->23. <A
+>22. <A
 HREF="speed.html"
 >Samba performance issues</A
 ></DT
 ><DD
 ><DL
 ><DT
->23.1. <A
-HREF="speed.html#AEN3065"
+>22.1. <A
+HREF="speed.html#AEN3055"
 >Comparisons</A
 ></DT
 ><DT
->23.2. <A
-HREF="speed.html#AEN3071"
->Oplocks</A
-></DT
-><DT
->23.3. <A
-HREF="speed.html#AEN3091"
+>22.2. <A
+HREF="speed.html#AEN3061"
 >Socket options</A
 ></DT
 ><DT
->23.4. <A
-HREF="speed.html#AEN3098"
+>22.3. <A
+HREF="speed.html#AEN3068"
 >Read size</A
 ></DT
 ><DT
->23.5. <A
-HREF="speed.html#AEN3103"
+>22.4. <A
+HREF="speed.html#AEN3073"
 >Max xmit</A
 ></DT
 ><DT
->23.6. <A
-HREF="speed.html#AEN3108"
->Locking</A
-></DT
-><DT
->23.7. <A
-HREF="speed.html#AEN3112"
->Share modes</A
-></DT
-><DT
->23.8. <A
-HREF="speed.html#AEN3117"
+>22.5. <A
+HREF="speed.html#AEN3078"
 >Log level</A
 ></DT
 ><DT
->23.9. <A
-HREF="speed.html#AEN3120"
->Wide lines</A
-></DT
-><DT
->23.10. <A
-HREF="speed.html#AEN3123"
+>22.6. <A
+HREF="speed.html#AEN3081"
 >Read raw</A
 ></DT
 ><DT
->23.11. <A
-HREF="speed.html#AEN3128"
+>22.7. <A
+HREF="speed.html#AEN3086"
 >Write raw</A
 ></DT
 ><DT
->23.12. <A
-HREF="speed.html#AEN3132"
->Read prediction</A
-></DT
-><DT
->23.13. <A
-HREF="speed.html#AEN3139"
->Memory mapping</A
-></DT
-><DT
->23.14. <A
-HREF="speed.html#AEN3144"
+>22.8. <A
+HREF="speed.html#AEN3090"
 >Slow Clients</A
 ></DT
 ><DT
->23.15. <A
-HREF="speed.html#AEN3148"
+>22.9. <A
+HREF="speed.html#AEN3094"
 >Slow Logins</A
 ></DT
 ><DT
->23.16. <A
-HREF="speed.html#AEN3151"
+>22.10. <A
+HREF="speed.html#AEN3097"
 >Client tuning</A
 ></DT
-><DT
->23.17. <A
-HREF="speed.html#AEN3183"
->My Results</A
-></DT
 ></DL
 ></DD
 ></DL
@@ -942,132 +886,132 @@ HREF="appendixes.html"
 ><DD
 ><DL
 ><DT
->24. <A
+>23. <A
 HREF="portability.html"
 >Portability</A
 ></DT
 ><DD
 ><DL
 ><DT
->24.1. <A
-HREF="portability.html#AEN3198"
+>23.1. <A
+HREF="portability.html#AEN3139"
 >HPUX</A
 ></DT
 ><DT
->24.2. <A
-HREF="portability.html#AEN3204"
+>23.2. <A
+HREF="portability.html#AEN3145"
 >SCO Unix</A
 ></DT
 ><DT
->24.3. <A
-HREF="portability.html#AEN3208"
+>23.3. <A
+HREF="portability.html#AEN3149"
 >DNIX</A
 ></DT
 ><DT
->24.4. <A
-HREF="portability.html#AEN3237"
+>23.4. <A
+HREF="portability.html#AEN3178"
 >RedHat Linux Rembrandt-II</A
 ></DT
 ></DL
 ></DD
 ><DT
->25. <A
+>24. <A
 HREF="other-clients.html"
 >Samba and other CIFS clients</A
 ></DT
 ><DD
 ><DL
 ><DT
->25.1. <A
-HREF="other-clients.html#AEN3258"
+>24.1. <A
+HREF="other-clients.html#AEN3199"
 >Macintosh clients?</A
 ></DT
 ><DT
->25.2. <A
-HREF="other-clients.html#AEN3267"
+>24.2. <A
+HREF="other-clients.html#AEN3208"
 >OS2 Client</A
 ></DT
 ><DT
->25.3. <A
-HREF="other-clients.html#AEN3307"
+>24.3. <A
+HREF="other-clients.html#AEN3248"
 >Windows for Workgroups</A
 ></DT
 ><DT
->25.4. <A
-HREF="other-clients.html#AEN3328"
+>24.4. <A
+HREF="other-clients.html#AEN3269"
 >Windows '95/'98</A
 ></DT
 ><DT
->25.5. <A
-HREF="other-clients.html#AEN3344"
+>24.5. <A
+HREF="other-clients.html#AEN3285"
 >Windows 2000 Service Pack 2</A
 ></DT
 ></DL
 ></DD
 ><DT
->26. <A
+>25. <A
 HREF="bugreport.html"
 >Reporting Bugs</A
 ></DT
 ><DD
 ><DL
 ><DT
->26.1. <A
-HREF="bugreport.html#AEN3368"
+>25.1. <A
+HREF="bugreport.html#AEN3309"
 >Introduction</A
 ></DT
 ><DT
->26.2. <A
-HREF="bugreport.html#AEN3378"
+>25.2. <A
+HREF="bugreport.html#AEN3319"
 >General info</A
 ></DT
 ><DT
->26.3. <A
-HREF="bugreport.html#AEN3384"
+>25.3. <A
+HREF="bugreport.html#AEN3325"
 >Debug levels</A
 ></DT
 ><DT
->26.4. <A
-HREF="bugreport.html#AEN3401"
+>25.4. <A
+HREF="bugreport.html#AEN3342"
 >Internal errors</A
 ></DT
 ><DT
->26.5. <A
-HREF="bugreport.html#AEN3411"
+>25.5. <A
+HREF="bugreport.html#AEN3352"
 >Attaching to a running process</A
 ></DT
 ><DT
->26.6. <A
-HREF="bugreport.html#AEN3414"
+>25.6. <A
+HREF="bugreport.html#AEN3355"
 >Patches</A
 ></DT
 ></DL
 ></DD
 ><DT
->27. <A
+>26. <A
 HREF="diagnosis.html"
 >Diagnosing your samba server</A
 ></DT
 ><DD
 ><DL
 ><DT
->27.1. <A
-HREF="diagnosis.html#AEN3437"
+>26.1. <A
+HREF="diagnosis.html#AEN3378"
 >Introduction</A
 ></DT
 ><DT
->27.2. <A
-HREF="diagnosis.html#AEN3442"
+>26.2. <A
+HREF="diagnosis.html#AEN3383"
 >Assumptions</A
 ></DT
 ><DT
->27.3. <A
-HREF="diagnosis.html#AEN3452"
+>26.3. <A
+HREF="diagnosis.html#AEN3393"
 >Tests</A
 ></DT
 ><DT
->27.4. <A
-HREF="diagnosis.html#AEN3562"
+>26.4. <A
+HREF="diagnosis.html#AEN3503"
 >Still having troubles?</A
 ></DT
 ></DL
diff --git a/docs/htmldocs/samba-ldap-howto.html b/docs/htmldocs/samba-ldap-howto.html
index 17f74b9bbc..884bb756c1 100644
--- a/docs/htmldocs/samba-ldap-howto.html
+++ b/docs/htmldocs/samba-ldap-howto.html
@@ -5,7 +5,8 @@
 >Storing Samba's User/Machine Account information in an LDAP Directory</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="SAMBA-LDAP-HOWTO"
-></A
->Chapter 20. Storing Samba's User/Machine Account information in an LDAP Directory</H1
+NAME="SAMBA-LDAP-HOWTO">Chapter 19. Storing Samba's User/Machine Account information in an LDAP Directory</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2747"
-></A
->20.1. Purpose</H1
+NAME="AEN2737">19.1. Purpose</H1
 ><P
 >This document describes how to use an LDAP directory for storing Samba user
 account information traditionally stored in the smbpasswd(5) file.  It is
@@ -125,7 +122,7 @@ early summer, 2002.</P
 ><LI
 ><P
 >The <A
-HREF="http://www.unav.es/cti/ldap-smb/ldap-smb-2_2-howto.html"
+HREF="http://www.unav.es/cti/ldap-smb/ldap-smb-3-howto.html"
 TARGET="_top"
 >Samba-PDC-LDAP-HOWTO</A
 >
@@ -148,9 +145,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2767"
-></A
->20.2. Introduction</H1
+NAME="AEN2757">19.2. Introduction</H1
 ><P
 >Traditionally, when configuring <A
 HREF="smb.conf.5.html#ENCRYPTPASSWORDS"
@@ -265,9 +260,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2796"
-></A
->20.3. Supported LDAP Servers</H1
+NAME="AEN2786">19.3. Supported LDAP Servers</H1
 ><P
 >The LDAP samdb code in 2.2.3 has been developed and tested using the OpenLDAP
 2.0 server and client libraries.  The same code should be able to work with
@@ -290,9 +283,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2801"
-></A
->20.4. Schema and Relationship to the RFC 2307 posixAccount</H1
+NAME="AEN2791">19.4. Schema and Relationship to the RFC 2307 posixAccount</H1
 ><P
 >Samba 2.2.3 includes the necessary schema file for OpenLDAP 2.0 in
 <TT
@@ -349,17 +340,13 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2813"
-></A
->20.5. Configuring Samba with LDAP</H1
+NAME="AEN2803">19.5. Configuring Samba with LDAP</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2815"
-></A
->20.5.1. OpenLDAP configuration</H2
+NAME="AEN2805">19.5.1. OpenLDAP configuration</H2
 ><P
 >To include support for the sambaAccount object in an OpenLDAP directory
 server, first copy the samba.schema file to slapd's configuration directory.</P
@@ -439,9 +426,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2832"
-></A
->20.5.2. Configuring Samba</H2
+NAME="AEN2822">19.5.2. Configuring Samba</H2
 ><P
 >The following parameters are available in smb.conf only with <TT
 CLASS="PARAMETER"
@@ -559,9 +544,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2860"
-></A
->20.6. Accounts and Groups management</H1
+NAME="AEN2850">19.6. Accounts and Groups management</H1
 ><P
 >As users accounts are managed thru the sambaAccount objectclass, you should
 modify you existing administration tools to deal with sambaAccount attributes.</P
@@ -584,9 +567,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2865"
-></A
->20.7. Security and sambaAccount</H1
+NAME="AEN2855">19.7. Security and sambaAccount</H1
 ><P
 >There are two important points to remember when discussing the security
 of sambaAccount entries in the directory.</P
@@ -663,9 +644,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2885"
-></A
->20.8. LDAP specials attributes for sambaAccounts</H1
+NAME="AEN2875">19.8. LDAP specials attributes for sambaAccounts</H1
 ><P
 >The sambaAccount objectclass is composed of the following attributes:</P
 ><P
@@ -874,9 +853,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2955"
-></A
->20.9. Example LDIF Entries for a sambaAccount</H1
+NAME="AEN2945">19.9. Example LDIF Entries for a sambaAccount</H1
 ><P
 >The following is a working LDIF with the inclusion of the posixAccount objectclass:</P
 ><P
@@ -932,9 +909,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2963"
-></A
->20.10. Comments</H1
+NAME="AEN2953">19.10. Comments</H1
 ><P
 >Please mail all comments regarding this HOWTO to <A
 HREF="mailto:jerry@samba.org"
diff --git a/docs/htmldocs/samba-pdc.html b/docs/htmldocs/samba-pdc.html
index daab00fba9..93bbc727d4 100644
--- a/docs/htmldocs/samba-pdc.html
+++ b/docs/htmldocs/samba-pdc.html
@@ -5,7 +5,8 @@
 >How to Configure Samba as a NT4 Primary Domain Controller</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="SAMBA-PDC"
-></A
->Chapter 7. How to Configure Samba as a NT4 Primary Domain Controller</H1
+NAME="SAMBA-PDC">Chapter 6. How to Configure Samba as a NT4 Primary Domain Controller</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN591"
-></A
->7.1. Prerequisite Reading</H1
+NAME="AEN575">6.1. Prerequisite Reading</H1
 ><P
 >Before you continue reading in this chapter, please make sure 
 that you are comfortable with configuring basic files services
@@ -108,9 +105,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN597"
-></A
->7.2. Background</H1
+NAME="AEN581">6.2. Background</H1
 ><DIV
 CLASS="NOTE"
 ><P
@@ -125,7 +120,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -260,9 +255,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN636"
-></A
->7.3. Configuring the Samba Domain Controller</H1
+NAME="AEN620">6.3. Configuring the Samba Domain Controller</H1
 ><P
 >The first step in creating a working Samba PDC is to 
 understand the parameters necessary in smb.conf.  I will not
@@ -472,9 +465,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN679"
-></A
->7.4. Creating Machine Trust Accounts and Joining Clients to the
+NAME="AEN663">6.4. Creating Machine Trust Accounts and Joining Clients to the
 Domain</H1
 ><P
 >A machine trust account is a Samba account that is used to
@@ -546,9 +537,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN698"
-></A
->7.4.1. Manual Creation of Machine Trust Accounts</H2
+NAME="AEN682">6.4.1. Manual Creation of Machine Trust Accounts</H2
 ><P
 >The first step in manually creating a machine trust account is to
 manually create the corresponding Unix account in
@@ -700,7 +689,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TH
@@ -736,9 +725,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN739"
-></A
->7.4.2. "On-the-Fly" Creation of Machine Trust Accounts</H2
+NAME="AEN723">6.4.2. "On-the-Fly" Creation of Machine Trust Accounts</H2
 ><P
 >The second (and recommended) way of creating machine trust accounts is
 simply to allow the Samba server to create them as needed when the client
@@ -773,9 +760,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN748"
-></A
->7.4.3. Joining the Client to the Domain</H2
+NAME="AEN732">6.4.3. Joining the Client to the Domain</H2
 ><P
 >The procedure for joining a client to the domain varies with the
 version of Windows.</P
@@ -841,9 +826,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN763"
-></A
->7.5. Common Problems and Errors</H1
+NAME="AEN747">6.5. Common Problems and Errors</H1
 ><P
 ></P
 ><P
@@ -1051,9 +1034,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN811"
-></A
->7.6. System Policies and Profiles</H1
+NAME="AEN795">6.6. System Policies and Profiles</H1
 ><P
 >Much of the information necessary to implement System Policies and
 Roving User Profiles in a Samba domain is the same as that for 
@@ -1228,9 +1209,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN855"
-></A
->7.7. What other help can I get?</H1
+NAME="AEN839">6.7. What other help can I get?</H1
 ><P
 >There are many sources of information available in the form 
 of mailing lists, RFC's and documentation.  The docs that come 
@@ -1648,9 +1627,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN969"
-></A
->7.8. Domain Control for Windows 9x/ME</H1
+NAME="AEN953">6.8. Domain Control for Windows 9x/ME</H1
 ><DIV
 CLASS="NOTE"
 ><P
@@ -1665,7 +1642,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -1782,9 +1759,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN995"
-></A
->7.8.1. Configuration Instructions:	Network Logons</H2
+NAME="AEN979">6.8.1. Configuration Instructions:	Network Logons</H2
 ><P
 >The main difference between a PDC and a Windows 9x logon 
 server configuration is that</P
@@ -1817,7 +1792,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TH
@@ -1888,9 +1863,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1014"
-></A
->7.8.2. Configuration Instructions:	Setting up Roaming User Profiles</H2
+NAME="AEN998">6.8.2. Configuration Instructions:	Setting up Roaming User Profiles</H2
 ><DIV
 CLASS="WARNING"
 ><P
@@ -1905,7 +1878,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TD
@@ -1941,9 +1914,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1022"
-></A
->7.8.2.1. Windows NT Configuration</H3
+NAME="AEN1006">6.8.2.1. Windows NT Configuration</H3
 ><P
 >To support WinNT clients, in the [global] section of smb.conf set the
 following (for example):</P
@@ -1972,7 +1943,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -1992,9 +1963,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1030"
-></A
->7.8.2.2. Windows 9X Configuration</H3
+NAME="AEN1014">6.8.2.2. Windows 9X Configuration</H3
 ><P
 >To support Win9X clients, you must use the "logon home" parameter. Samba has
 now been fixed so that "net use/home" now works as well, and it, too, relies
@@ -2023,9 +1992,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1038"
-></A
->7.8.2.3. Win9X and WinNT Configuration</H3
+NAME="AEN1022">6.8.2.3. Win9X and WinNT Configuration</H3
 ><P
 >You can support profiles for both Win9X and WinNT clients by setting both the
 "logon home" and "logon path" parameters. For example:</P
@@ -2049,7 +2016,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -2068,9 +2035,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1045"
-></A
->7.8.2.4. Windows 9X Profile Setup</H3
+NAME="AEN1029">6.8.2.4. Windows 9X Profile Setup</H3
 ><P
 >When a user first logs in on Windows 9X, the file user.DAT is created,
 as are folders "Start Menu", "Desktop", "Programs" and "Nethood".  
@@ -2228,9 +2193,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1081"
-></A
->7.8.2.5. Windows NT Workstation 4.0</H3
+NAME="AEN1065">6.8.2.5. Windows NT Workstation 4.0</H3
 ><P
 >When a user first logs in to a Windows NT Workstation, the profile
 NTuser.DAT is created.  The profile location can be now specified
@@ -2249,7 +2212,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -2307,7 +2270,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -2342,9 +2305,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1094"
-></A
->7.8.2.6. Windows NT Server</H3
+NAME="AEN1078">6.8.2.6. Windows NT Server</H3
 ><P
 >There is nothing to stop you specifying any path that you like for the
 location of users' profiles.  Therefore, you could specify that the
@@ -2356,9 +2317,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1097"
-></A
->7.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</H3
+NAME="AEN1081">6.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</H3
 ><DIV
 CLASS="WARNING"
 ><P
@@ -2373,7 +2332,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TH
@@ -2425,7 +2384,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/note.gif"
+SRC="../images/note.gif"
 HSPACE="5"
 ALT="Note"></TD
 ><TD
@@ -2449,9 +2408,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1107"
-></A
->7.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</H1
+NAME="AEN1091">6.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</H1
 ><DIV
 CLASS="WARNING"
 ><P
@@ -2466,7 +2423,7 @@ WIDTH="25"
 ALIGN="CENTER"
 VALIGN="TOP"
 ><IMG
-SRC="/docbook-dsssl/warning.gif"
+SRC="../images/warning.gif"
 HSPACE="5"
 ALT="Warning"></TD
 ><TH
diff --git a/docs/htmldocs/securitylevels.html b/docs/htmldocs/securitylevels.html
index f1e9297fca..f1b9967540 100644
--- a/docs/htmldocs/securitylevels.html
+++ b/docs/htmldocs/securitylevels.html
@@ -5,7 +5,8 @@
 >User and Share security level (for servers not in a domain)</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,9 +73,7 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="SECURITYLEVELS"
-></A
->Chapter 6. User and Share security level (for servers not in a domain)</H1
+NAME="SECURITYLEVELS">Chapter 5. User and Share security level (for servers not in a domain)</H1
 ><P
 >A SMB server tells the client at startup what "security level" it is
 running. There are two options "share level" and "user level". Which
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 84b0920d5b..9c1ee7a67b 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -16,9 +16,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="SMB.CONF"
-></A
->smb.conf</H1
+NAME="SMB.CONF">smb.conf</H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
@@ -1605,6 +1603,30 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#LDAPPORT"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap port</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LDAPSERVER"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap server</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#LDAPSSL"
 ><TT
 CLASS="PARAMETER"
@@ -3155,7 +3177,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1013"
+NAME="AEN1021"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -4670,7 +4692,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1517"
+NAME="AEN1525"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -9808,6 +9830,74 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="LDAPPORT"
+></A
+>ldap port (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+                configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+                at compile time.
+                </P
+><P
+>                This option is used to control the tcp port number used to contact
+                the <A
+HREF="#LDAPSERVER"
+><TT
+CLASS="PARAMETER"
+><I
+>ldap server</I
+></TT
+></A
+>.
+                The default is to use the stand LDAPS port 636.
+                </P
+><P
+>See Also: <A
+HREF="#LDAPSSL"
+>ldap ssl</A
+>
+                </P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap port = 636 ; if ldap ssl = on</B
+></P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap port = 389 ; if ldap ssl = off</B
+></P
+></DD
+><DT
+><A
+NAME="LDAPSERVER"
+></A
+>ldap server (G)</DT
+><DD
+><P
+>This parameter is only available if Samba has been
+                configure to include the <B
+CLASS="COMMAND"
+>--with-ldapsam</B
+> option
+                at compile time.
+                </P
+><P
+>                This parameter should contain the FQDN of the ldap directory
+                server which should be queried to locate user account information.
+                </P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap server = localhost</B
+></P
+></DD
+><DT
+><A
 NAME="LDAPSSL"
 ></A
 >ldap ssl (G)</DT
@@ -13057,7 +13147,7 @@ CLASS="PARAMETER"
 > 
 		list will be allowed. By default this option is disabled so that a 
 		client can supply a username to be used by the server.  Enabling
-		this parameter will force the server to only user the login 
+		this parameter will force the server to only use the login 
 		names from the <TT
 CLASS="PARAMETER"
 ><I
@@ -13066,7 +13156,7 @@ CLASS="PARAMETER"
 > list and is only really
 		useful in <A
 HREF="#SECURITYEQUALSSHARE"
->shave level</A
+>share level</A
 >
 		security.</P
 ><P
@@ -19486,7 +19576,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6163"
+NAME="AEN6195"
 ></A
 ><H2
 >WARNINGS</H2
@@ -19516,7 +19606,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6169"
+NAME="AEN6201"
 ></A
 ><H2
 >VERSION</H2
@@ -19527,7 +19617,7 @@ NAME="AEN6169"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6172"
+NAME="AEN6204"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -19606,7 +19696,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6192"
+NAME="AEN6224"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 4be8a257d3..65f5f95b8d 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -191,7 +191,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >-S</B
 > parameter had been
-		given. 
+		given.
 		</P
 ></DD
 ><DT
diff --git a/docs/htmldocs/speed.html b/docs/htmldocs/speed.html
index 85562e3e89..1a05706f92 100644
--- a/docs/htmldocs/speed.html
+++ b/docs/htmldocs/speed.html
@@ -5,7 +5,8 @@
 >Samba performance issues</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="SPEED"
-></A
->Chapter 23. Samba performance issues</H1
+NAME="SPEED">Chapter 22. Samba performance issues</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3065"
-></A
->23.1. Comparisons</H1
+NAME="AEN3055">22.1. Comparisons</H1
 ><P
 >The Samba server uses TCP to talk to the client. Thus if you are
 trying to see if it performs well you should really compare it to
@@ -111,98 +108,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3071"
-></A
->23.2. Oplocks</H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3073"
-></A
->23.2.1. Overview</H2
-><P
->Oplocks are the way that SMB clients get permission from a server to
-locally cache file operations. If a server grants an oplock
-(opportunistic lock) then the client is free to assume that it is the
-only one accessing the file and it will agressively cache file
-data. With some oplock types the client may even cache file open/close
-operations. This can give enormous performance benefits.</P
-><P
->With the release of Samba 1.9.18 we now correctly support opportunistic 
-locks. This is turned on by default, and can be turned off on a share-
-by-share basis by setting the parameter :</P
-><P
-><B
-CLASS="COMMAND"
->oplocks = False</B
-></P
-><P
->We recommend that you leave oplocks on however, as current benchmark
-tests with NetBench seem to give approximately a 30% improvement in
-speed with them on. This is on average however, and the actual 
-improvement seen can be orders of magnitude greater, depending on
-what the client redirector is doing.</P
-><P
->Previous to Samba 1.9.18 there was a 'fake oplocks' option. This
-option has been left in the code for backwards compatibility reasons
-but it's use is now deprecated. A short summary of what the old
-code did follows.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3081"
-></A
->23.2.2. Level2 Oplocks</H2
-><P
->With Samba 2.0.5 a new capability - level2 (read only) oplocks is
-supported (although the option is off by default - see the smb.conf
-man page for details). Turning on level2 oplocks (on a share-by-share basis)
-by setting the parameter :</P
-><P
-><B
-CLASS="COMMAND"
->level2 oplocks = true</B
-></P
-><P
->should speed concurrent access to files that are not commonly written
-to, such as application serving shares (ie. shares that contain common
-.EXE files - such as a Microsoft Office share) as it allows clients to
-read-ahread cache copies of these files.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN3087"
-></A
->23.2.3. Old 'fake oplocks' option - deprecated</H2
-><P
->Samba can also fake oplocks, by granting a oplock whenever a client 
-asks for one. This is controlled using the smb.conf option "fake 
-oplocks". If you set "fake oplocks = yes" then you are telling the 
-client that it may agressively cache the file data for all opens.</P
-><P
->Enabling 'fake oplocks' on all read-only shares or shares that you know
-will only be accessed from one client at a time you will see a big
-performance improvement on many operations. If you enable this option
-on shares where multiple clients may be accessing the files read-write
-at the same time you can get data corruption.</P
-></DIV
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3091"
-></A
->23.3. Socket options</H1
+NAME="AEN3061">22.2. Socket options</H1
 ><P
 >There are a number of socket options that can greatly affect the
 performance of a TCP based server like Samba.</P
@@ -228,9 +134,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3098"
-></A
->23.4. Read size</H1
+NAME="AEN3068">22.3. Read size</H1
 ><P
 >The option "read size" affects the overlap of disk reads/writes with
 network reads/writes. If the amount of data being transferred in
@@ -254,9 +158,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3103"
-></A
->23.5. Max xmit</H1
+NAME="AEN3073">22.4. Max xmit</H1
 ><P
 >At startup the client and server negotiate a "maximum transmit" size,
 which limits the size of nearly all SMB commands. You can set the
@@ -277,56 +179,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3108"
-></A
->23.6. Locking</H1
-><P
->By default Samba does not implement strict locking on each read/write
-call (although it did in previous versions). If you enable strict
-locking (using "strict locking = yes") then you may find that you
-suffer a severe performance hit on some systems.</P
-><P
->The performance hit will probably be greater on NFS mounted
-filesystems, but could be quite high even on local disks.</P
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3112"
-></A
->23.7. Share modes</H1
-><P
->Some people find that opening files is very slow. This is often
-because of the "share modes" code needed to fully implement the dos
-share modes stuff. You can disable this code using "share modes =
-no". This will gain you a lot in opening and closing files but will
-mean that (in some cases) the system won't force a second user of a
-file to open the file read-only if the first has it open
-read-write. For many applications that do their own locking this
-doesn't matter, but for some it may. Most Windows applications
-depend heavily on "share modes" working correctly and it is
-recommended that the Samba share mode support be left at the
-default of "on".</P
-><P
->The share mode code in Samba has been re-written in the 1.9.17
-release following tests with the Ziff-Davis NetBench PC Benchmarking
-tool. It is now believed that Samba 1.9.17 implements share modes
-similarly to Windows NT.</P
-><P
->NOTE: In the most recent versions of Samba there is an option to use
-shared memory via mmap() to implement the share modes. This makes
-things much faster. See the Makefile for how to enable this.</P
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3117"
-></A
->23.8. Log level</H1
+NAME="AEN3078">22.5. Log level</H1
 ><P
 >If you set the log level (also known as "debug level") higher than 2
 then you may suffer a large drop in performance. This is because the
@@ -338,23 +191,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3120"
-></A
->23.9. Wide lines</H1
-><P
->The "wide links" option is now enabled by default, but if you disable
-it (for better security) then you may suffer a performance hit in
-resolving filenames. The performance loss is lessened if you have
-"getwd cache = yes", which is now the default.</P
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3123"
-></A
->23.10. Read raw</H1
+NAME="AEN3081">22.6. Read raw</H1
 ><P
 >The "read raw" operation is designed to be an optimised, low-latency
 file read operation. A server may choose to not support it,
@@ -374,9 +211,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3128"
-></A
->23.11. Write raw</H1
+NAME="AEN3086">22.7. Write raw</H1
 ><P
 >The "write raw" operation is designed to be an optimised, low-latency
 file write operation. A server may choose to not support it,
@@ -391,56 +226,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3132"
-></A
->23.12. Read prediction</H1
-><P
->Samba can do read prediction on some of the SMB commands. Read
-prediction means that Samba reads some extra data on the last file it
-read while waiting for the next SMB command to arrive. It can then
-respond more quickly when the next read request arrives.</P
-><P
->This is disabled by default. You can enable it by using "read
-prediction = yes".</P
-><P
->Note that read prediction is only used on files that were opened read
-only.</P
-><P
->Read prediction should particularly help for those silly clients (such
-as "Write" under NT) which do lots of very small reads on a file.</P
-><P
->Samba will not read ahead more data than the amount specified in the
-"read size" option. It always reads ahead on 1k block boundaries.</P
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3139"
-></A
->23.13. Memory mapping</H1
-><P
->Samba supports reading files via memory mapping them. One some
-machines this can give a large boost to performance, on others it
-makes not difference at all, and on some it may reduce performance.</P
-><P
->To enable you you have to recompile Samba with the -DUSE_MMAP option
-on the FLAGS line of the Makefile.</P
-><P
->Note that memory mapping is only used on files opened read only, and
-is not used by the "read raw" operation. Thus you may find memory
-mapping is more effective if you disable "read raw" using "read raw =
-no".</P
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3144"
-></A
->23.14. Slow Clients</H1
+NAME="AEN3090">22.8. Slow Clients</H1
 ><P
 >One person has reported that setting the protocol to COREPLUS rather
 than LANMAN2 gave a dramatic speed improvement (from 10k/s to 150k/s).</P
@@ -455,9 +241,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3148"
-></A
->23.15. Slow Logins</H1
+NAME="AEN3094">22.9. Slow Logins</H1
 ><P
 >Slow logins are almost always due to the password checking time. Using
 the lowest practical "password level" will improve things a lot. You
@@ -468,9 +252,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN3151"
-></A
->23.16. Client tuning</H1
+NAME="AEN3097">22.10. Client tuning</H1
 ><P
 >Often a speed problem can be traced to the client. The client (for
 example Windows for Workgroups) can often be tuned for better TCP
@@ -545,11 +327,13 @@ turned out I was better off without any!!!!!</P
 and a DX2-66 20MB server with a crappy NE2000 compatible and old IDE 
 drive (Kernel 2.0.30). The transfer rate was reasonable for 10 baseT.</P
 ><P
->FIXME
-The figures are:          Put              Get 
+><PRE
+CLASS="PROGRAMLISTING"
+>The figures are:          Put              Get 
 P166 client 3Com card:    420-440kB/s      500-520kB/s
 P100 client 3Com card:    390-410kB/s      490-510kB/s
-DX4-75 client NE2000:     370-380kB/s      330-350kB/s</P
+DX4-75 client NE2000:     370-380kB/s      330-350kB/s</PRE
+></P
 ><P
 >I based these test on transfer two files a 4.5MB text file and a 15MB 
 textfile. The results arn't bad considering the hardware Samba is 
@@ -567,35 +351,6 @@ upwards). I suppose there is more going on in the samba protocol, but
 if it could get up to the rate of FTP the perfomance would be quite 
 staggering.</P
 ></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN3183"
-></A
->23.17. My Results</H1
-><P
->Some people want to see real numbers in a document like this, so here
-they are. I have a 486sx33 client running WfWg 3.11 with the 3.11b
-tcp/ip stack. It has a slow IDE drive and 20Mb of ram. It has a SMC
-Elite-16 ISA bus ethernet card. The only WfWg tuning I've done is to
-set DefaultRcvWindow in the [MSTCP] section of system.ini to 16384. My
-server is a 486dx3-66 running Linux. It also has 20Mb of ram and a SMC
-Elite-16 card. You can see my server config in the examples/tridge/
-subdirectory of the distribution.</P
-><P
->I get 490k/s on reading a 8Mb file with copy.
-I get 441k/s writing the same file to the samba server.</P
-><P
->Of course, there's a lot more to benchmarks than 2 raw throughput
-figures, but it gives you a ballpark figure.</P
-><P
->I've also tested Win95 and WinNT, and found WinNT gave me the best
-speed as a samba client. The fastest client of all (for me) is
-smbclient running on another linux box. Maybe I'll add those results
-here someday ...</P
-></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/docs/htmldocs/type.html b/docs/htmldocs/type.html
index ec6aa6df6c..e3f09acc18 100644
--- a/docs/htmldocs/type.html
+++ b/docs/htmldocs/type.html
@@ -5,7 +5,8 @@
 >Type of installation</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -68,9 +69,7 @@ WIDTH="100%"></DIV
 ><DIV
 CLASS="PART"
 ><A
-NAME="TYPE"
-></A
-><DIV
+NAME="TYPE"><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
@@ -78,9 +77,7 @@ CLASS="TITLE"
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN547"
-></A
-><H1
+NAME="AEN531"><H1
 >Introduction</H1
 ><P
 >Samba can operate in various SMB networks. This part contains information on configuring samba 
@@ -94,149 +91,149 @@ CLASS="TOC"
 >Table of Contents</B
 ></DT
 ><DT
->6. <A
+>5. <A
 HREF="securitylevels.html"
 >User and Share security level (for servers not in a domain)</A
 ></DT
 ><DT
->7. <A
+>6. <A
 HREF="samba-pdc.html"
 >How to Configure Samba as a NT4 Primary Domain Controller</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.1. <A
-HREF="samba-pdc.html#AEN591"
+>6.1. <A
+HREF="samba-pdc.html#AEN575"
 >Prerequisite Reading</A
 ></DT
 ><DT
->7.2. <A
-HREF="samba-pdc.html#AEN597"
+>6.2. <A
+HREF="samba-pdc.html#AEN581"
 >Background</A
 ></DT
 ><DT
->7.3. <A
-HREF="samba-pdc.html#AEN636"
+>6.3. <A
+HREF="samba-pdc.html#AEN620"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
->7.4. <A
-HREF="samba-pdc.html#AEN679"
+>6.4. <A
+HREF="samba-pdc.html#AEN663"
 >Creating Machine Trust Accounts and Joining Clients to the
 Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.4.1. <A
-HREF="samba-pdc.html#AEN698"
+>6.4.1. <A
+HREF="samba-pdc.html#AEN682"
 >Manual Creation of Machine Trust Accounts</A
 ></DT
 ><DT
->7.4.2. <A
-HREF="samba-pdc.html#AEN739"
+>6.4.2. <A
+HREF="samba-pdc.html#AEN723"
 >"On-the-Fly" Creation of Machine Trust Accounts</A
 ></DT
 ><DT
->7.4.3. <A
-HREF="samba-pdc.html#AEN748"
+>6.4.3. <A
+HREF="samba-pdc.html#AEN732"
 >Joining the Client to the Domain</A
 ></DT
 ></DL
 ></DD
 ><DT
->7.5. <A
-HREF="samba-pdc.html#AEN763"
+>6.5. <A
+HREF="samba-pdc.html#AEN747"
 >Common Problems and Errors</A
 ></DT
 ><DT
->7.6. <A
-HREF="samba-pdc.html#AEN811"
+>6.6. <A
+HREF="samba-pdc.html#AEN795"
 >System Policies and Profiles</A
 ></DT
 ><DT
->7.7. <A
-HREF="samba-pdc.html#AEN855"
+>6.7. <A
+HREF="samba-pdc.html#AEN839"
 >What other help can I get?</A
 ></DT
 ><DT
->7.8. <A
-HREF="samba-pdc.html#AEN969"
+>6.8. <A
+HREF="samba-pdc.html#AEN953"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.8.1. <A
-HREF="samba-pdc.html#AEN995"
+>6.8.1. <A
+HREF="samba-pdc.html#AEN979"
 >Configuration Instructions:	Network Logons</A
 ></DT
 ><DT
->7.8.2. <A
-HREF="samba-pdc.html#AEN1014"
+>6.8.2. <A
+HREF="samba-pdc.html#AEN998"
 >Configuration Instructions:	Setting up Roaming User Profiles</A
 ></DT
 ></DL
 ></DD
 ><DT
->7.9. <A
-HREF="samba-pdc.html#AEN1107"
+>6.9. <A
+HREF="samba-pdc.html#AEN1091"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->8. <A
+>7. <A
 HREF="samba-bdc.html"
 >How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.1. <A
-HREF="samba-bdc.html#AEN1143"
+>7.1. <A
+HREF="samba-bdc.html#AEN1127"
 >Prerequisite Reading</A
 ></DT
 ><DT
->8.2. <A
-HREF="samba-bdc.html#AEN1147"
+>7.2. <A
+HREF="samba-bdc.html#AEN1131"
 >Background</A
 ></DT
 ><DT
->8.3. <A
-HREF="samba-bdc.html#AEN1155"
+>7.3. <A
+HREF="samba-bdc.html#AEN1139"
 >What qualifies a Domain Controller on the network?</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.3.1. <A
-HREF="samba-bdc.html#AEN1158"
+>7.3.1. <A
+HREF="samba-bdc.html#AEN1142"
 >How does a Workstation find its domain controller?</A
 ></DT
 ><DT
->8.3.2. <A
-HREF="samba-bdc.html#AEN1161"
+>7.3.2. <A
+HREF="samba-bdc.html#AEN1145"
 >When is the PDC needed?</A
 ></DT
 ></DL
 ></DD
 ><DT
->8.4. <A
-HREF="samba-bdc.html#AEN1164"
+>7.4. <A
+HREF="samba-bdc.html#AEN1148"
 >Can Samba be a Backup Domain Controller?</A
 ></DT
 ><DT
->8.5. <A
-HREF="samba-bdc.html#AEN1168"
+>7.5. <A
+HREF="samba-bdc.html#AEN1152"
 >How do I set up a Samba BDC?</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.5.1. <A
-HREF="samba-bdc.html#AEN1185"
+>7.5.1. <A
+HREF="samba-bdc.html#AEN1169"
 >How do I replicate the smbpasswd file?</A
 ></DT
 ></DL
@@ -244,83 +241,83 @@ HREF="samba-bdc.html#AEN1185"
 ></DL
 ></DD
 ><DT
->9. <A
+>8. <A
 HREF="ads.html"
 >Samba as a ADS domain member</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.1. <A
-HREF="ads.html#AEN1203"
+>8.1. <A
+HREF="ads.html#AEN1187"
 >Installing the required packages for Debian</A
 ></DT
 ><DT
->9.2. <A
-HREF="ads.html#AEN1209"
+>8.2. <A
+HREF="ads.html#AEN1193"
 >Installing the required packages for RedHat</A
 ></DT
 ><DT
->9.3. <A
-HREF="ads.html#AEN1218"
+>8.3. <A
+HREF="ads.html#AEN1202"
 >Compile Samba</A
 ></DT
 ><DT
->9.4. <A
-HREF="ads.html#AEN1230"
+>8.4. <A
+HREF="ads.html#AEN1217"
 >Setup your /etc/krb5.conf</A
 ></DT
 ><DT
->9.5. <A
-HREF="ads.html#AEN1240"
+>8.5. <A
+HREF="ads.html#AEN1227"
 >Create the computer account</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.5.1. <A
-HREF="ads.html#AEN1244"
+>8.5.1. <A
+HREF="ads.html#AEN1231"
 >Possible errors</A
 ></DT
 ></DL
 ></DD
 ><DT
->9.6. <A
-HREF="ads.html#AEN1256"
+>8.6. <A
+HREF="ads.html#AEN1243"
 >Test your server setup</A
 ></DT
 ><DT
->9.7. <A
-HREF="ads.html#AEN1261"
+>8.7. <A
+HREF="ads.html#AEN1248"
 >Testing with smbclient</A
 ></DT
 ><DT
->9.8. <A
-HREF="ads.html#AEN1264"
+>8.8. <A
+HREF="ads.html#AEN1251"
 >Notes</A
 ></DT
 ></DL
 ></DD
 ><DT
->10. <A
+>9. <A
 HREF="domain-security.html"
 >Samba as a NT4 domain member</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.1. <A
-HREF="domain-security.html#AEN1286"
+>9.1. <A
+HREF="domain-security.html#AEN1273"
 >Joining an NT Domain with Samba 2.2</A
 ></DT
 ><DT
->10.2. <A
-HREF="domain-security.html#AEN1350"
+>9.2. <A
+HREF="domain-security.html#AEN1337"
 >Samba and Windows 2000 Domains</A
 ></DT
 ><DT
->10.3. <A
-HREF="domain-security.html#AEN1355"
+>9.3. <A
+HREF="domain-security.html#AEN1342"
 >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 864fedea7b..f29d450e6d 100644
--- a/docs/htmldocs/unix-permissions.html
+++ b/docs/htmldocs/unix-permissions.html
@@ -5,7 +5,8 @@
 >UNIX Permission Bits and Windows NT Access Control Lists</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -73,17 +74,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="UNIX-PERMISSIONS"
-></A
->Chapter 12. UNIX Permission Bits and Windows NT Access Control Lists</H1
+NAME="UNIX-PERMISSIONS">Chapter 11. UNIX Permission Bits and Windows NT Access Control Lists</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1618"
-></A
->12.1. Viewing and changing UNIX permissions using the NT 
+NAME="AEN1605">11.1. Viewing and changing UNIX permissions using the NT 
 	security dialogs</H1
 ><P
 >New in the Samba 2.0.4 release is the ability for Windows 
@@ -120,9 +117,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1627"
-></A
->12.2. How to view file security on a Samba share</H1
+NAME="AEN1614">11.2. How to view file security on a Samba share</H1
 ><P
 >From an NT 4.0 client, single-click with the right 
 	mouse button on any file or directory in a Samba mounted 
@@ -190,9 +185,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1638"
-></A
->12.3. Viewing file ownership</H1
+NAME="AEN1625">11.3. Viewing file ownership</H1
 ><P
 >Clicking on the <B
 CLASS="COMMAND"
@@ -284,9 +277,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1658"
-></A
->12.4. Viewing file or directory permissions</H1
+NAME="AEN1645">11.4. Viewing file or directory permissions</H1
 ><P
 >The third button is the <B
 CLASS="COMMAND"
@@ -346,9 +337,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1673"
-></A
->12.4.1. File Permissions</H2
+NAME="AEN1660">11.4.1. File Permissions</H2
 ><P
 >The standard UNIX user/group/world triple and 
 		the corresponding "read", "write", "execute" permissions 
@@ -408,9 +397,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1687"
-></A
->12.4.2. Directory Permissions</H2
+NAME="AEN1674">11.4.2. Directory Permissions</H2
 ><P
 >Directories on an NT NTFS file system have two 
 		different sets of permissions. The first set of permissions 
@@ -440,9 +427,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1694"
-></A
->12.5. Modifying file or directory permissions</H1
+NAME="AEN1681">11.5. Modifying file or directory permissions</H1
 ><P
 >Modifying file and directory permissions is as simple 
 	as changing the displayed permissions in the dialog box, and 
@@ -538,9 +523,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1716"
-></A
->12.6. Interaction with the standard Samba create mask 
+NAME="AEN1703">11.6. Interaction with the standard Samba create mask 
 	parameters</H1
 ><P
 >Note that with Samba 2.0.5 there are four new parameters 
@@ -815,9 +798,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1780"
-></A
->12.7. Interaction with the standard Samba file attribute 
+NAME="AEN1767">11.7. Interaction with the standard Samba file attribute 
 	mapping</H1
 ><P
 >Samba maps some of the DOS attribute bits (such as "read 
diff --git a/docs/htmldocs/vfs.html b/docs/htmldocs/vfs.html
index fb0554e10c..11934ae47c 100644
--- a/docs/htmldocs/vfs.html
+++ b/docs/htmldocs/vfs.html
@@ -5,7 +5,8 @@
 >Stackable VFS modules</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,63 +73,58 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="VFS"
-></A
->Chapter 19. Stackable VFS modules</H1
+NAME="VFS">Chapter 18. Stackable VFS modules</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2651"
-></A
->19.1. Introduction and configuration</H1
+NAME="AEN2640">18.1. Introduction and configuration</H1
 ><P
->Since samba 3.0, samba supports stackable VFS(Virtual File System) modules. 
+>Since samba 3.0, samba supports stackable VFS(Virtual File System) modules.  
 Samba passes each request to access the unix file system thru the loaded VFS modules. 
 This chapter covers all the modules that come with the samba source and references to 
 some external modules.</P
 ><P
 >You may have problems to compile these modules, as shared libraries are
 compiled and linked in different ways on different systems.
-I currently tested them against GNU/linux and IRIX.</P
+They currently have been tested against GNU/linux and IRIX.</P
 ><P
 >To use the VFS modules, create a share similar to the one below.  The
 important parameter is the <B
 CLASS="COMMAND"
 >vfs object</B
 > parameter which must point to
-the exact pathname of the shared library object. For example, to use audit.so:
+the exact pathname of the shared library objects. For example, to log all access 
+to files and use a recycle bin:
 
 <PRE
 CLASS="PROGRAMLISTING"
 >       [audit]
                 comment = Audited /data directory
                 path = /data
-                vfs object = /path/to/audit.so
+                vfs object = /path/to/audit.so /path/to/recycle.so
                 writeable = yes
                 browseable = yes</PRE
 ></P
 ><P
+>The modules are used in the order they are specified.</P
+><P
 >Further documentation on writing VFS modules for Samba can be found in
-docs directory of the Samba source distribution.</P
+the Samba Developers Guide.</P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2659"
-></A
->19.2. Included modules</H1
+NAME="AEN2649">18.2. Included modules</H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2661"
-></A
->19.2.1. audit</H2
+NAME="AEN2651">18.2.1. audit</H2
 ><P
 >A simple module to audit file access to the syslog
 facility.  The following operations are logged:
@@ -164,9 +160,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2669"
-></A
->19.2.2. recycle</H2
+NAME="AEN2659">18.2.2. recycle</H2
 ><P
 >A recycle-bin like modules. When used any unlink call
 will be intercepted and files moved to the recycle
@@ -235,9 +229,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2706"
-></A
->19.2.3. netatalk</H2
+NAME="AEN2696">18.2.3. netatalk</H2
 ><P
 >A netatalk module, that will ease co-existence of samba and
 netatalk file sharing services.</P
@@ -268,9 +260,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2713"
-></A
->19.3. VFS modules available elsewhere</H1
+NAME="AEN2703">18.3. VFS modules available elsewhere</H1
 ><P
 >This section contains a listing of various other VFS modules that 
 have been posted but don't currently reside in the Samba CVS 
@@ -284,9 +274,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2717"
-></A
->19.3.1. DatabaseFS</H2
+NAME="AEN2707">18.3.1. DatabaseFS</H2
 ><P
 >URL: <A
 HREF="http://www.css.tayloru.edu/~elorimer/databasefs/index.php"
@@ -318,9 +306,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2725"
-></A
->19.3.2. vscan</H2
+NAME="AEN2715">18.3.2. vscan</H2
 ><P
 >URL: <A
 HREF="http://www.openantivirus.org/"
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index df5a59f771..1558512a61 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -5,7 +5,8 @@
 >Unified Logons between Windows NT and UNIX using Winbind</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.77"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><LINK
 REL="HOME"
 TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
@@ -72,17 +73,13 @@ WIDTH="100%"></DIV
 CLASS="CHAPTER"
 ><H1
 ><A
-NAME="WINBIND"
-></A
->Chapter 16. Unified Logons between Windows NT and UNIX using Winbind</H1
+NAME="WINBIND">Chapter 15. Unified Logons between Windows NT and UNIX using Winbind</H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2238"
-></A
->16.1. Abstract</H1
+NAME="AEN2225">15.1. Abstract</H1
 ><P
 >Integration of UNIX and Microsoft Windows NT through 
 	a unified logon has been considered a "holy grail" in heterogeneous 
@@ -107,9 +104,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2242"
-></A
->16.2. Introduction</H1
+NAME="AEN2229">15.2. Introduction</H1
 ><P
 >It is well known that UNIX and Microsoft Windows NT have 
 	different models for representing user and group information and 
@@ -161,9 +156,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2255"
-></A
->16.3. What Winbind Provides</H1
+NAME="AEN2242">15.3. What Winbind Provides</H1
 ><P
 >Winbind unifies UNIX and Windows NT account management by 
 	allowing a UNIX box to become a full member of a NT domain. Once 
@@ -203,9 +196,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2262"
-></A
->16.3.1. Target Uses</H2
+NAME="AEN2249">15.3.1. Target Uses</H2
 ><P
 >Winbind is targeted at organizations that have an 
 		existing NT based domain infrastructure into which they wish 
@@ -227,9 +218,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2266"
-></A
->16.4. How Winbind Works</H1
+NAME="AEN2253">15.4. How Winbind Works</H1
 ><P
 >The winbind system is designed around a client/server 
 	architecture. A long running <B
@@ -247,9 +236,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2271"
-></A
->16.4.1. Microsoft Remote Procedure Calls</H2
+NAME="AEN2258">15.4.1. Microsoft Remote Procedure Calls</H2
 ><P
 >Over the last two years, efforts have been underway 
 		by various Samba Team members to decode various aspects of 
@@ -273,9 +260,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2275"
-></A
->16.4.2. Name Service Switch</H2
+NAME="AEN2262">15.4.2. Name Service Switch</H2
 ><P
 >The Name Service Switch, or NSS, is a feature that is 
 		present in many UNIX operating systems. It allows system 
@@ -353,9 +338,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2291"
-></A
->16.4.3. Pluggable Authentication Modules</H2
+NAME="AEN2278">15.4.3. Pluggable Authentication Modules</H2
 ><P
 >Pluggable Authentication Modules, also known as PAM, 
 		is a system for abstracting authentication and authorization 
@@ -402,9 +385,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2299"
-></A
->16.4.4. User and Group ID Allocation</H2
+NAME="AEN2286">15.4.4. User and Group ID Allocation</H2
 ><P
 >When a user or group is created under Windows NT 
 		is it allocated a numerical relative identifier (RID). This is 
@@ -428,9 +409,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2303"
-></A
->16.4.5. Result Caching</H2
+NAME="AEN2290">15.4.5. Result Caching</H2
 ><P
 >An active system can generate a lot of user and group 
 		name lookups. To reduce the network cost of these lookups winbind 
@@ -451,9 +430,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2306"
-></A
->16.5. Installation and Configuration</H1
+NAME="AEN2293">15.5. Installation and Configuration</H1
 ><P
 >Many thanks to John Trostel <A
 HREF="mailto:jtrostel@snapserver.com"
@@ -478,9 +455,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2313"
-></A
->16.5.1. Introduction</H2
+NAME="AEN2300">15.5.1. Introduction</H2
 ><P
 >This HOWTO describes the procedures used to get winbind up and 
 running on my RedHat 7.1 system.  Winbind is capable of providing access 
@@ -537,9 +512,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2326"
-></A
->16.5.2. Requirements</H2
+NAME="AEN2313">15.5.2. Requirements</H2
 ><P
 >If you have a samba configuration file that you are currently 
 using... <SPAN
@@ -607,9 +580,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2340"
-></A
->16.5.3. Testing Things Out</H2
+NAME="AEN2327">15.5.3. Testing Things Out</H2
 ><P
 >Before starting, it is probably best to kill off all the SAMBA 
 related daemons running on your server.  Kill off all <B
@@ -652,9 +623,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2351"
-></A
->16.5.3.1. Configure and compile SAMBA</H3
+NAME="AEN2338">15.5.3.1. Configure and compile SAMBA</H3
 ><P
 >The configuration and compilation of SAMBA is pretty straightforward.
 The first three steps may not be necessary depending upon
@@ -718,9 +687,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2370"
-></A
->16.5.3.2. Configure <TT
+NAME="AEN2357">15.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
 > and the 
@@ -823,9 +790,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2403"
-></A
->16.5.3.3. Configure smb.conf</H3
+NAME="AEN2390">15.5.3.3. Configure smb.conf</H3
 ><P
 >Several parameters are needed in the smb.conf file to control 
 the behavior of <B
@@ -898,9 +863,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2419"
-></A
->16.5.3.4. Join the SAMBA server to the PDC domain</H3
+NAME="AEN2406">15.5.3.4. Join the SAMBA server to the PDC domain</H3
 ><P
 >Enter the following command to make the SAMBA server join the 
 PDC domain, where <TT
@@ -944,9 +907,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2430"
-></A
->16.5.3.5. Start up the winbindd daemon and test it!</H3
+NAME="AEN2417">15.5.3.5. Start up the winbindd daemon and test it!</H3
 ><P
 >Eventually, you will want to modify your smb startup script to 
 automatically invoke the winbindd daemon when the other parts of 
@@ -1067,17 +1028,13 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2466"
-></A
->16.5.3.6. Fix the init.d startup scripts</H3
+NAME="AEN2453">15.5.3.6. Fix the init.d startup scripts</H3
 ><DIV
 CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2468"
-></A
->16.5.3.6.1. Linux</H4
+NAME="AEN2455">15.5.3.6.1. Linux</H4
 ><P
 >The <B
 CLASS="COMMAND"
@@ -1171,9 +1128,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2485"
-></A
->16.5.3.6.2. Solaris</H4
+NAME="AEN2472">15.5.3.6.2. Solaris</H4
 ><P
 >On solaris, you need to modify the 
 <TT
@@ -1242,9 +1197,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2492"
-></A
->16.5.3.6.3. Restarting</H4
+NAME="AEN2479">15.5.3.6.3. Restarting</H4
 ><P
 >If you restart the <B
 CLASS="COMMAND"
@@ -1266,9 +1219,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2498"
-></A
->16.5.3.7. Configure Winbind and PAM</H3
+NAME="AEN2485">15.5.3.7. Configure Winbind and PAM</H3
 ><P
 >If you have made it this far, you know that winbindd and samba are working
 together.  If you want to use winbind to provide authentication for other 
@@ -1324,9 +1275,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2515"
-></A
->16.5.3.7.1. Linux/FreeBSD-specific PAM configuration</H4
+NAME="AEN2502">15.5.3.7.1. Linux/FreeBSD-specific PAM configuration</H4
 ><P
 >The <TT
 CLASS="FILENAME"
@@ -1453,9 +1402,7 @@ CLASS="SECT4"
 ><H4
 CLASS="SECT4"
 ><A
-NAME="AEN2548"
-></A
->16.5.3.7.2. Solaris-specific configuration</H4
+NAME="AEN2535">15.5.3.7.2. Solaris-specific configuration</H4
 ><P
 >The /etc/pam.conf needs to be changed. I changed this file so that my Domain
 users can logon both locally as well as telnet.The following are the changes
@@ -1540,9 +1487,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2555"
-></A
->16.6. Limitations</H1
+NAME="AEN2542">15.6. Limitations</H1
 ><P
 >Winbind has a number of limitations in its current 
 	released version that we hope to overcome in future 
@@ -1581,9 +1526,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2565"
-></A
->16.7. Conclusion</H1
+NAME="AEN2552">15.7. Conclusion</H1
 ><P
 >The winbind system, through the use of the Name Service 
 	Switch, Pluggable Authentication Modules, and appropriate 
-- 
cgit