* merge fixes for SGML syntax errors (does no one ever regenerate the docs?)

* regenerate the docs
* add some files from SAMBA_3_0
(This used to be commit 1af74785f334bd84b2d62e7fc2975f9477386acb)

1 files changed, 237 insertions, 294 deletions

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