Sync up with Gerry's changes.

Jeremy

5 files changed, 326 insertions, 321 deletions

diff --git a/docs/htmldocs/DOMAIN_MEMBER.html b/docs/htmldocs/DOMAIN_MEMBER.html
index bb29c416eb4..b7ef4c9a61b 100644
--- a/docs/htmldocs/DOMAIN_MEMBER.html
+++ b/docs/htmldocs/DOMAIN_MEMBER.html
@@ -32,17 +32,7 @@ NAME="AEN3"
 >Joining an NT Domain with Samba 2.2</A
 ></H1
 ><P
->In order for a Samba-2 server to join an NT domain, 
-	you must first add the NetBIOS name of the Samba server to the 
-	NT domain on the PDC using Server Manager for Domains.  This creates 
-	the machine account in the domain (PDC) SAM. Note that you should 
-	add the Samba server as a "Windows NT Workstation or Server", 
-	<I
-CLASS="EMPHASIS"
->NOT</I
-> as a Primary or backup domain controller.</P
-><P
->Assume you have a Samba-2 server with a NetBIOS name of 
+>Assume you have a Samba 2.x server with a NetBIOS name of 
 	<TT
 CLASS="CONSTANT"
 >SERV1</TT
@@ -74,13 +64,26 @@ CLASS="PROMPT"
 CLASS="USERINPUT"
 ><B
 >smbpasswd -j DOM -r DOMPDC
-	</B
+	-U<TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+></B
 ></TT
 ></P
 ><P
 >as we are joining the domain DOM and the PDC for that domain 
 	(the only machine that has write access to the domain SAM database) 
-	is DOMPDC. If this is successful you will see the message:</P
+	is DOMPDC. The <TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+> is 
+	the login name and password for an account which has the necessary 
+	privilege to add machines to the domain.  If this is successful 
+	you will see the message:</P
 ><P
 ><TT
 CLASS="COMPUTEROUTPUT"
diff --git a/docs/htmldocs/PAM-Authentication-And-Samba.html b/docs/htmldocs/PAM-Authentication-And-Samba.html
index 332a8a73499..6dc815b87bf 100644
--- a/docs/htmldocs/PAM-Authentication-And-Samba.html
+++ b/docs/htmldocs/PAM-Authentication-And-Samba.html
@@ -157,15 +157,24 @@ Samba implementation for your Unix/Linux system. The
 CLASS="FILENAME"
 >pam_smbpass.so</TT
 > module is provided by 
-Samba version 2.2.1 or later. It can be compiled only if the 
-<TT
-CLASS="CONSTANT"
->--with-pam --with-pam_smbpass</TT
-> options are both 
-provided to the Samba <B
+Samba version 2.2.1 or later. It can be compiled by specifying the 
+<B
 CLASS="COMMAND"
->configure</B
-> program.</P
+>--with-pam_smbpass</B
+> options when running Samba's
+<TT
+CLASS="FILENAME"
+>configure</TT
+> script.  For more information
+on the <TT
+CLASS="FILENAME"
+>pam_smbpass</TT
+> module, see the documentation
+in the <TT
+CLASS="FILENAME"
+>source/pam_smbpass</TT
+> directory of the Samba 
+source distribution.</P
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
@@ -235,7 +244,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN45"
+NAME="AEN47"
 >Distributed Authentication</A
 ></H1
 ><P
@@ -268,7 +277,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN52"
+NAME="AEN54"
 >PAM Configuration in smb.conf</A
 ></H1
 ><P
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index c4e4b2c74b5..988766d5340 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -336,12 +336,12 @@ HREF="#AEN455"
 ></DT
 ><DT
 >3.2. <A
-HREF="#AEN497"
+HREF="#AEN499"
 >Distributed Authentication</A
 ></DT
 ><DT
 >3.3. <A
-HREF="#AEN504"
+HREF="#AEN506"
 >PAM Configuration in smb.conf</A
 ></DT
 ></DL
@@ -355,14 +355,14 @@ HREF="#MSDFS"
 ><DL
 ><DT
 >4.1. <A
-HREF="#AEN524"
+HREF="#AEN526"
 >Instructions</A
 ></DT
 ><DD
 ><DL
 ><DT
 >4.1.1. <A
-HREF="#AEN559"
+HREF="#AEN561"
 >Notes</A
 ></DT
 ></DL
@@ -378,53 +378,53 @@ HREF="#UNIX-PERMISSIONS"
 ><DL
 ><DT
 >5.1. <A
-HREF="#AEN579"
+HREF="#AEN581"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
 >5.2. <A
-HREF="#AEN588"
+HREF="#AEN590"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
 >5.3. <A
-HREF="#AEN599"
+HREF="#AEN601"
 >Viewing file ownership</A
 ></DT
 ><DT
 >5.4. <A
-HREF="#AEN619"
+HREF="#AEN621"
 >Viewing file or directory permissions</A
 ></DT
 ><DD
 ><DL
 ><DT
 >5.4.1. <A
-HREF="#AEN634"
+HREF="#AEN636"
 >File Permissions</A
 ></DT
 ><DT
 >5.4.2. <A
-HREF="#AEN648"
+HREF="#AEN650"
 >Directory Permissions</A
 ></DT
 ></DL
 ></DD
 ><DT
 >5.5. <A
-HREF="#AEN655"
+HREF="#AEN657"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
 >5.6. <A
-HREF="#AEN677"
+HREF="#AEN679"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
 >5.7. <A
-HREF="#AEN741"
+HREF="#AEN743"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
@@ -439,75 +439,75 @@ HREF="#PRINTING"
 ><DL
 ><DT
 >6.1. <A
-HREF="#AEN762"
+HREF="#AEN764"
 >Introduction</A
 ></DT
 ><DT
 >6.2. <A
-HREF="#AEN784"
+HREF="#AEN786"
 >Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.2.1. <A
-HREF="#AEN795"
+HREF="#AEN797"
 >Creating [print$]</A
 ></DT
 ><DT
 >6.2.2. <A
-HREF="#AEN830"
+HREF="#AEN832"
 >Setting Drivers for Existing Printers</A
 ></DT
 ><DT
 >6.2.3. <A
-HREF="#AEN847"
+HREF="#AEN849"
 >Support a large number of printers</A
 ></DT
 ><DT
 >6.2.4. <A
-HREF="#AEN858"
+HREF="#AEN860"
 >Adding New Printers via the Windows NT APW</A
 ></DT
 ><DT
 >6.2.5. <A
-HREF="#AEN883"
+HREF="#AEN885"
 >Samba and Printer Ports</A
 ></DT
 ></DL
 ></DD
 ><DT
 >6.3. <A
-HREF="#AEN891"
+HREF="#AEN893"
 >The Imprints Toolset</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.3.1. <A
-HREF="#AEN895"
+HREF="#AEN897"
 >What is Imprints?</A
 ></DT
 ><DT
 >6.3.2. <A
-HREF="#AEN905"
+HREF="#AEN907"
 >Creating Printer Driver Packages</A
 ></DT
 ><DT
 >6.3.3. <A
-HREF="#AEN908"
+HREF="#AEN910"
 >The Imprints server</A
 ></DT
 ><DT
 >6.3.4. <A
-HREF="#AEN912"
+HREF="#AEN914"
 >The Installation Client</A
 ></DT
 ></DL
 ></DD
 ><DT
 >6.4. <A
-HREF="#AEN934"
+HREF="#AEN936"
 ><A
 NAME="MIGRATION"
 ></A
@@ -524,17 +524,17 @@ HREF="#DOMAIN-SECURITY"
 ><DL
 ><DT
 >7.1. <A
-HREF="#AEN988"
+HREF="#AEN990"
 >Joining an NT Domain with Samba 2.2</A
 ></DT
 ><DT
 >7.2. <A
-HREF="#AEN1052"
+HREF="#AEN1054"
 >Samba and Windows 2000 Domains</A
 ></DT
 ><DT
 >7.3. <A
-HREF="#AEN1057"
+HREF="#AEN1059"
 >Why is this better than security = server?</A
 ></DT
 ></DL
@@ -548,22 +548,22 @@ HREF="#SAMBA-PDC"
 ><DL
 ><DT
 >8.1. <A
-HREF="#AEN1090"
+HREF="#AEN1092"
 >Prerequisite Reading</A
 ></DT
 ><DT
 >8.2. <A
-HREF="#AEN1096"
+HREF="#AEN1098"
 >Background</A
 ></DT
 ><DT
 >8.3. <A
-HREF="#AEN1138"
+HREF="#AEN1140"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
 >8.4. <A
-HREF="#AEN1180"
+HREF="#AEN1182"
 >Creating Machine Trust Accounts and Joining Clients 
 to the Domain</A
 ></DT
@@ -571,83 +571,83 @@ to the Domain</A
 ><DL
 ><DT
 >8.4.1. <A
-HREF="#AEN1194"
+HREF="#AEN1196"
 >Manually creating machine trust accounts</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="#AEN1225"
+HREF="#AEN1227"
 >Creating machine trust accounts "on the fly"</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.5. <A
-HREF="#AEN1236"
+HREF="#AEN1238"
 >Common Problems and Errors</A
 ></DT
 ><DT
 >8.6. <A
-HREF="#AEN1284"
+HREF="#AEN1286"
 >System Policies and Profiles</A
 ></DT
 ><DT
 >8.7. <A
-HREF="#AEN1328"
+HREF="#AEN1330"
 >What other help can I get ?</A
 ></DT
 ><DT
 >8.8. <A
-HREF="#AEN1442"
+HREF="#AEN1444"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.8.1. <A
-HREF="#AEN1472"
+HREF="#AEN1474"
 >Configuration Instructions:	Network Logons</A
 ></DT
 ><DT
 >8.8.2. <A
-HREF="#AEN1506"
+HREF="#AEN1508"
 >Configuration Instructions:	Setting up Roaming User Profiles</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.8.2.1. <A
-HREF="#AEN1514"
+HREF="#AEN1516"
 >Windows NT Configuration</A
 ></DT
 ><DT
 >8.8.2.2. <A
-HREF="#AEN1522"
+HREF="#AEN1524"
 >Windows 9X Configuration</A
 ></DT
 ><DT
 >8.8.2.3. <A
-HREF="#AEN1530"
+HREF="#AEN1532"
 >Win9X and WinNT Configuration</A
 ></DT
 ><DT
 >8.8.2.4. <A
-HREF="#AEN1537"
+HREF="#AEN1539"
 >Windows 9X Profile Setup</A
 ></DT
 ><DT
 >8.8.2.5. <A
-HREF="#AEN1573"
+HREF="#AEN1575"
 >Windows NT Workstation 4.0</A
 ></DT
 ><DT
 >8.8.2.6. <A
-HREF="#AEN1586"
+HREF="#AEN1588"
 >Windows NT Server</A
 ></DT
 ><DT
 >8.8.2.7. <A
-HREF="#AEN1589"
+HREF="#AEN1591"
 >Sharing Profiles between W95 and NT Workstation 4.0</A
 ></DT
 ></DL
@@ -656,7 +656,7 @@ HREF="#AEN1589"
 ></DD
 ><DT
 >8.9. <A
-HREF="#AEN1599"
+HREF="#AEN1601"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></DT
 ></DL
@@ -670,119 +670,119 @@ HREF="#WINBIND"
 ><DL
 ><DT
 >9.1. <A
-HREF="#AEN1642"
+HREF="#AEN1644"
 >Abstract</A
 ></DT
 ><DT
 >9.2. <A
-HREF="#AEN1646"
+HREF="#AEN1648"
 >Introduction</A
 ></DT
 ><DT
 >9.3. <A
-HREF="#AEN1659"
+HREF="#AEN1661"
 >What Winbind Provides</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.3.1. <A
-HREF="#AEN1666"
+HREF="#AEN1668"
 >Target Uses</A
 ></DT
 ></DL
 ></DD
 ><DT
 >9.4. <A
-HREF="#AEN1670"
+HREF="#AEN1672"
 >How Winbind Works</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.4.1. <A
-HREF="#AEN1675"
+HREF="#AEN1677"
 >Microsoft Remote Procedure Calls</A
 ></DT
 ><DT
 >9.4.2. <A
-HREF="#AEN1679"
+HREF="#AEN1681"
 >Name Service Switch</A
 ></DT
 ><DT
 >9.4.3. <A
-HREF="#AEN1695"
+HREF="#AEN1697"
 >Pluggable Authentication Modules</A
 ></DT
 ><DT
 >9.4.4. <A
-HREF="#AEN1703"
+HREF="#AEN1705"
 >User and Group ID Allocation</A
 ></DT
 ><DT
 >9.4.5. <A
-HREF="#AEN1707"
+HREF="#AEN1709"
 >Result Caching</A
 ></DT
 ></DL
 ></DD
 ><DT
 >9.5. <A
-HREF="#AEN1710"
+HREF="#AEN1712"
 >Installation and Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.5.1. <A
-HREF="#AEN1715"
+HREF="#AEN1717"
 >Introduction</A
 ></DT
 ><DT
 >9.5.2. <A
-HREF="#AEN1728"
+HREF="#AEN1730"
 >Requirements</A
 ></DT
 ><DT
 >9.5.3. <A
-HREF="#AEN1736"
+HREF="#AEN1738"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.5.3.1. <A
-HREF="#AEN1745"
+HREF="#AEN1747"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
 >9.5.3.2. <A
-HREF="#AEN1757"
+HREF="#AEN1759"
 >Configure nsswitch.conf and the winbind libraries</A
 ></DT
 ><DT
 >9.5.3.3. <A
-HREF="#AEN1776"
+HREF="#AEN1778"
 >Configure smb.conf</A
 ></DT
 ><DT
 >9.5.3.4. <A
-HREF="#AEN1785"
+HREF="#AEN1787"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
 >9.5.3.5. <A
-HREF="#AEN1795"
+HREF="#AEN1797"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
 >9.5.3.6. <A
-HREF="#AEN1822"
+HREF="#AEN1824"
 >Fix the /etc/rc.d/init.d/smb startup files</A
 ></DT
 ><DT
 >9.5.3.7. <A
-HREF="#AEN1839"
+HREF="#AEN1841"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -791,12 +791,12 @@ HREF="#AEN1839"
 ></DD
 ><DT
 >9.6. <A
-HREF="#AEN1880"
+HREF="#AEN1882"
 >Limitations</A
 ></DT
 ><DT
 >9.7. <A
-HREF="#AEN1890"
+HREF="#AEN1892"
 >Conclusion</A
 ></DT
 ></DL
@@ -810,32 +810,32 @@ HREF="#OS2"
 ><DL
 ><DT
 >10.1. <A
-HREF="#AEN1904"
+HREF="#AEN1906"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
 >10.1.1. <A
-HREF="#AEN1906"
+HREF="#AEN1908"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
 >10.1.2. <A
-HREF="#AEN1921"
+HREF="#AEN1923"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
 >10.1.3. <A
-HREF="#AEN1930"
+HREF="#AEN1932"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
 >10.1.4. <A
-HREF="#AEN1934"
+HREF="#AEN1936"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -852,24 +852,24 @@ HREF="#CVS-ACCESS"
 ><DL
 ><DT
 >11.1. <A
-HREF="#AEN1950"
+HREF="#AEN1952"
 >Introduction</A
 ></DT
 ><DT
 >11.2. <A
-HREF="#AEN1955"
+HREF="#AEN1957"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
 >11.2.1. <A
-HREF="#AEN1958"
+HREF="#AEN1960"
 >Access via CVSweb</A
 ></DT
 ><DT
 >11.2.2. <A
-HREF="#AEN1963"
+HREF="#AEN1965"
 >Access via cvs</A
 ></DT
 ></DL
@@ -878,7 +878,7 @@ HREF="#AEN1963"
 ></DD
 ><DT
 ><A
-HREF="#AEN1991"
+HREF="#AEN1993"
 >Index</A
 ></DT
 ></DL
@@ -3034,15 +3034,24 @@ Samba implementation for your Unix/Linux system. The
 CLASS="FILENAME"
 >pam_smbpass.so</TT
 > module is provided by 
-Samba version 2.2.1 or later. It can be compiled only if the 
-<TT
-CLASS="CONSTANT"
->--with-pam --with-pam_smbpass</TT
-> options are both 
-provided to the Samba <B
+Samba version 2.2.1 or later. It can be compiled by specifying the 
+<B
 CLASS="COMMAND"
->configure</B
-> program.</P
+>--with-pam_smbpass</B
+> options when running Samba's
+<TT
+CLASS="FILENAME"
+>configure</TT
+> script.  For more information
+on the <TT
+CLASS="FILENAME"
+>pam_smbpass</TT
+> module, see the documentation
+in the <TT
+CLASS="FILENAME"
+>source/pam_smbpass</TT
+> directory of the Samba 
+source distribution.</P
 ><P
 ><TABLE
 BORDER="0"
@@ -3139,7 +3148,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN497"
+NAME="AEN499"
 >3.2. Distributed Authentication</A
 ></H1
 ><P
@@ -3172,7 +3181,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN504"
+NAME="AEN506"
 >3.3. PAM Configuration in smb.conf</A
 ></H1
 ><P
@@ -3220,7 +3229,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN524"
+NAME="AEN526"
 >4.1. Instructions</A
 ></H1
 ><P
@@ -3377,7 +3386,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN559"
+NAME="AEN561"
 >4.1.1. Notes</A
 ></H2
 ><P
@@ -3418,7 +3427,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN579"
+NAME="AEN581"
 >5.1. Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></H1
@@ -3457,7 +3466,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN588"
+NAME="AEN590"
 >5.2. How to view file security on a Samba share</A
 ></H1
 ><P
@@ -3503,7 +3512,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN599"
+NAME="AEN601"
 >5.3. Viewing file ownership</A
 ></H1
 ><P
@@ -3589,7 +3598,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN619"
+NAME="AEN621"
 >5.4. Viewing file or directory permissions</A
 ></H1
 ><P
@@ -3651,7 +3660,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN634"
+NAME="AEN636"
 >5.4.1. File Permissions</A
 ></H2
 ><P
@@ -3713,7 +3722,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN648"
+NAME="AEN650"
 >5.4.2. Directory Permissions</A
 ></H2
 ><P
@@ -3745,7 +3754,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN655"
+NAME="AEN657"
 >5.5. Modifying file or directory permissions</A
 ></H1
 ><P
@@ -3843,7 +3852,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN677"
+NAME="AEN679"
 >5.6. Interaction with the standard Samba create mask 
 	parameters</A
 ></H1
@@ -4116,7 +4125,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN741"
+NAME="AEN743"
 >5.7. Interaction with the standard Samba file attribute 
 	mapping</A
 ></H1
@@ -4171,7 +4180,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN762"
+NAME="AEN764"
 >6.1. Introduction</A
 ></H1
 ><P
@@ -4255,7 +4264,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN784"
+NAME="AEN786"
 >6.2. Configuration</A
 ></H1
 ><DIV
@@ -4323,7 +4332,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN795"
+NAME="AEN797"
 >6.2.1. Creating [print$]</A
 ></H2
 ><P
@@ -4524,7 +4533,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN830"
+NAME="AEN832"
 >6.2.2. Setting Drivers for Existing Printers</A
 ></H2
 ><P
@@ -4596,7 +4605,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN847"
+NAME="AEN849"
 >6.2.3. Support a large number of printers</A
 ></H2
 ><P
@@ -4671,7 +4680,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN858"
+NAME="AEN860"
 >6.2.4. Adding New Printers via the Windows NT APW</A
 ></H2
 ><P
@@ -4777,7 +4786,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN883"
+NAME="AEN885"
 >6.2.5. Samba and Printer Ports</A
 ></H2
 ><P
@@ -4814,7 +4823,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN891"
+NAME="AEN893"
 >6.3. The Imprints Toolset</A
 ></H1
 ><P
@@ -4832,7 +4841,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN895"
+NAME="AEN897"
 >6.3.1. What is Imprints?</A
 ></H2
 ><P
@@ -4864,7 +4873,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN905"
+NAME="AEN907"
 >6.3.2. Creating Printer Driver Packages</A
 ></H2
 ><P
@@ -4880,7 +4889,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN908"
+NAME="AEN910"
 >6.3.3. The Imprints server</A
 ></H2
 ><P
@@ -4900,7 +4909,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN912"
+NAME="AEN914"
 >6.3.4. The Installation Client</A
 ></H2
 ><P
@@ -5003,7 +5012,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN934"
+NAME="AEN936"
 >6.4. <A
 NAME="MIGRATION"
 ></A
@@ -5167,20 +5176,11 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN988"
+NAME="AEN990"
 >7.1. Joining an NT Domain with Samba 2.2</A
 ></H1
 ><P
->In order for a Samba-2 server to join an NT domain, 
-	you must first add the NetBIOS name of the Samba server to the 
-	NT domain on the PDC using Server Manager for Domains.  This creates 
-	the machine account in the domain (PDC) SAM. Note that you should 
-	add the Samba server as a "Windows NT Workstation or Server", 
-	<EM
->NOT</EM
-> as a Primary or backup domain controller.</P
-><P
->Assume you have a Samba-2 server with a NetBIOS name of 
+>Assume you have a Samba 2.x server with a NetBIOS name of 
 	<TT
 CLASS="CONSTANT"
 >SERV1</TT
@@ -5212,13 +5212,26 @@ CLASS="PROMPT"
 CLASS="USERINPUT"
 ><B
 >smbpasswd -j DOM -r DOMPDC
-	</B
+	-U<TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+></B
 ></TT
 ></P
 ><P
 >as we are joining the domain DOM and the PDC for that domain 
 	(the only machine that has write access to the domain SAM database) 
-	is DOMPDC. If this is successful you will see the message:</P
+	is DOMPDC. The <TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+> is 
+	the login name and password for an account which has the necessary 
+	privilege to add machines to the domain.  If this is successful 
+	you will see the message:</P
 ><P
 ><TT
 CLASS="COMPUTEROUTPUT"
@@ -5394,7 +5407,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1052"
+NAME="AEN1054"
 >7.2. Samba and Windows 2000 Domains</A
 ></H1
 ><P
@@ -5419,7 +5432,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1057"
+NAME="AEN1059"
 >7.3. Why is this better than security = server?</A
 ></H1
 ><P
@@ -5513,7 +5526,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1090"
+NAME="AEN1092"
 >8.1. Prerequisite Reading</A
 ></H1
 ><P
@@ -5541,7 +5554,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1096"
+NAME="AEN1098"
 >8.2. Background</A
 ></H1
 ><DIV
@@ -5698,7 +5711,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1138"
+NAME="AEN1140"
 >8.3. Configuring the Samba Domain Controller</A
 ></H1
 ><P
@@ -5915,7 +5928,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1180"
+NAME="AEN1182"
 >8.4. Creating Machine Trust Accounts and Joining Clients 
 to the Domain</A
 ></H1
@@ -5973,7 +5986,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1194"
+NAME="AEN1196"
 >8.4.1. Manually creating machine trust accounts</A
 ></H2
 ><P
@@ -6124,7 +6137,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1225"
+NAME="AEN1227"
 >8.4.2. Creating machine trust accounts "on the fly"</A
 ></H2
 ><P
@@ -6172,7 +6185,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1236"
+NAME="AEN1238"
 >8.5. Common Problems and Errors</A
 ></H1
 ><P
@@ -6371,7 +6384,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1284"
+NAME="AEN1286"
 >8.6. System Policies and Profiles</A
 ></H1
 ><P
@@ -6528,7 +6541,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1328"
+NAME="AEN1330"
 >8.7. What other help can I get ?</A
 ></H1
 ><P
@@ -6924,7 +6937,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1442"
+NAME="AEN1444"
 >8.8. Domain Control for Windows 9x/ME</A
 ></H1
 ><DIV
@@ -7060,7 +7073,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1472"
+NAME="AEN1474"
 >8.8.1. Configuration Instructions:	Network Logons</A
 ></H2
 ><P
@@ -7249,7 +7262,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1506"
+NAME="AEN1508"
 >8.8.2. Configuration Instructions:	Setting up Roaming User Profiles</A
 ></H2
 ><DIV
@@ -7296,7 +7309,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1514"
+NAME="AEN1516"
 >8.8.2.1. Windows NT Configuration</A
 ></H3
 ><P
@@ -7340,7 +7353,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1522"
+NAME="AEN1524"
 >8.8.2.2. Windows 9X Configuration</A
 ></H3
 ><P
@@ -7380,7 +7393,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1530"
+NAME="AEN1532"
 >8.8.2.3. Win9X and WinNT Configuration</A
 ></H3
 ><P
@@ -7418,7 +7431,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1537"
+NAME="AEN1539"
 >8.8.2.4. Windows 9X Profile Setup</A
 ></H3
 ><P
@@ -7574,7 +7587,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1573"
+NAME="AEN1575"
 >8.8.2.5. Windows NT Workstation 4.0</A
 ></H3
 ><P
@@ -7656,7 +7669,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1586"
+NAME="AEN1588"
 >8.8.2.6. Windows NT Server</A
 ></H3
 ><P
@@ -7670,7 +7683,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1589"
+NAME="AEN1591"
 >8.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</A
 ></H3
 ><DIV
@@ -7735,7 +7748,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1599"
+NAME="AEN1601"
 >8.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></H1
 ><DIV
@@ -7864,7 +7877,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1642"
+NAME="AEN1644"
 >9.1. Abstract</A
 ></H1
 ><P
@@ -7887,7 +7900,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1646"
+NAME="AEN1648"
 >9.2. Introduction</A
 ></H1
 ><P
@@ -7941,7 +7954,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1659"
+NAME="AEN1661"
 >9.3. What Winbind Provides</A
 ></H1
 ><P
@@ -7983,7 +7996,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1666"
+NAME="AEN1668"
 >9.3.1. Target Uses</A
 ></H2
 ><P
@@ -8007,7 +8020,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1670"
+NAME="AEN1672"
 >9.4. How Winbind Works</A
 ></H1
 ><P
@@ -8027,7 +8040,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1675"
+NAME="AEN1677"
 >9.4.1. Microsoft Remote Procedure Calls</A
 ></H2
 ><P
@@ -8053,7 +8066,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1679"
+NAME="AEN1681"
 >9.4.2. Name Service Switch</A
 ></H2
 ><P
@@ -8133,7 +8146,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1695"
+NAME="AEN1697"
 >9.4.3. Pluggable Authentication Modules</A
 ></H2
 ><P
@@ -8182,7 +8195,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1703"
+NAME="AEN1705"
 >9.4.4. User and Group ID Allocation</A
 ></H2
 ><P
@@ -8208,7 +8221,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1707"
+NAME="AEN1709"
 >9.4.5. Result Caching</A
 ></H2
 ><P
@@ -8231,7 +8244,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1710"
+NAME="AEN1712"
 >9.5. Installation and Configuration</A
 ></H1
 ><P
@@ -8250,7 +8263,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1715"
+NAME="AEN1717"
 >9.5.1. Introduction</A
 ></H2
 ><P
@@ -8301,7 +8314,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1728"
+NAME="AEN1730"
 >9.5.2. Requirements</A
 ></H2
 ><P
@@ -8341,7 +8354,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1736"
+NAME="AEN1738"
 >9.5.3. Testing Things Out</A
 ></H2
 ><P
@@ -8379,7 +8392,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1745"
+NAME="AEN1747"
 >9.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
@@ -8433,7 +8446,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1757"
+NAME="AEN1759"
 >9.5.3.2. Configure nsswitch.conf and the winbind libraries</A
 ></H3
 ><P
@@ -8503,7 +8516,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1776"
+NAME="AEN1778"
 >9.5.3.3. Configure smb.conf</A
 ></H3
 ><P
@@ -8558,7 +8571,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1785"
+NAME="AEN1787"
 >9.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -8601,7 +8614,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1795"
+NAME="AEN1797"
 >9.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -8715,7 +8728,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1822"
+NAME="AEN1824"
 >9.5.3.6. Fix the /etc/rc.d/init.d/smb startup files</A
 ></H3
 ><P
@@ -8828,7 +8841,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1839"
+NAME="AEN1841"
 >9.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
@@ -9040,7 +9053,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1880"
+NAME="AEN1882"
 >9.6. Limitations</A
 ></H1
 ><P
@@ -9081,7 +9094,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1890"
+NAME="AEN1892"
 >9.7. Conclusion</A
 ></H1
 ><P
@@ -9105,7 +9118,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1904"
+NAME="AEN1906"
 >10.1. FAQs</A
 ></H1
 ><DIV
@@ -9113,7 +9126,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1906"
+NAME="AEN1908"
 >10.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
@@ -9172,7 +9185,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1921"
+NAME="AEN1923"
 >10.1.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
@@ -9225,7 +9238,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1930"
+NAME="AEN1932"
 >10.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
@@ -9247,7 +9260,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1934"
+NAME="AEN1936"
 >10.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
@@ -9303,7 +9316,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1950"
+NAME="AEN1952"
 >11.1. Introduction</A
 ></H1
 ><P
@@ -9325,7 +9338,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1955"
+NAME="AEN1957"
 >11.2. CVS Access to samba.org</A
 ></H1
 ><P
@@ -9338,7 +9351,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1958"
+NAME="AEN1960"
 >11.2.1. Access via CVSweb</A
 ></H2
 ><P
@@ -9359,7 +9372,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1963"
+NAME="AEN1965"
 >11.2.2. Access via cvs</A
 ></H2
 ><P
@@ -9465,14 +9478,14 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN1991"
+NAME="AEN1993"
 >Index</A
 ></H1
 ><DL
 ><DT
 >Primary  Domain Controller,
     <A
-HREF="x1096.htm"
+HREF="x1098.htm"
 >Background</A
 >
   </DT
diff --git a/docs/htmldocs/printer_driver2.html b/docs/htmldocs/printer_driver2.html
index 36d66c1c803..e6cc23b02cf 100644
--- a/docs/htmldocs/printer_driver2.html
+++ b/docs/htmldocs/printer_driver2.html
@@ -837,52 +837,67 @@ NAME="MIGRATION"
 ><P
 >Given that printer driver management has changed (we hope improved) in 
 2.2 over prior releases, migration from an existing setup to 2.2 can 
-follow several paths.</P
+follow several paths. Here are the possible scenarios for 
+migration:</P
 ><P
->Windows clients have a tendency to remember things for quite a while.
-For example, if a Windows NT client has attached to a Samba 2.0 server,
-it will remember the server as a LanMan printer server.  Upgrading 
-the Samba host to 2.2 makes support for MSRPC printing possible, but 
-the NT client will still remember the previous setting.</P
+></P
+><UL
+><LI
 ><P
->In order to give an NT client printing "amnesia" (only necessary if you 
-want to use the newer MSRPC printing functionality in Samba), delete 
-the registry keys associated with the print server contained in 
-<TT
-CLASS="CONSTANT"
->[HKLM\SYSTEM\CurrentControlSet\Control\Print]</TT
->.  The 
-spooler service on the client should be stopped prior to doing this:</P
+>If you do not desire the new Windows NT 
+	print driver support, nothing needs to be done.  
+	All existing parameters work the same.</P
+></LI
+><LI
 ><P
-><TT
-CLASS="PROMPT"
->C:\WINNT\ &#62;</TT
-> <TT
-CLASS="USERINPUT"
-><B
->net stop spooler</B
-></TT
-></P
+>If you want to take advantage of NT printer 
+	driver support but do not want to migrate the 
+	9x drivers to the new setup, the leave the existing 
+	<TT
+CLASS="FILENAME"
+>printers.def</TT
+> file.  When smbd attempts 
+	to locate a 
+	9x driver for the printer in the TDB and fails it 
+	will drop down to using the printers.def (and all 
+	associated parameters).  The <B
+CLASS="COMMAND"
+>make_printerdef</B
+> 
+	tool will also remain for backwards compatibility but will 
+	be removed in the next major release.</P
+></LI
+><LI
 ><P
-><I
-CLASS="EMPHASIS"
->All the normal disclaimers about editing the registry go 
-here.</I
->  Be careful, and know what you are doing.</P
+>If you install a Windows 9x driver for a printer 
+	on your Samba host (in the printing TDB), this information will 
+	take precedence and the three old printing parameters
+	will be ignored (including print driver location).</P
+></LI
+><LI
 ><P
->The spooler service should be restarted after you have finished 
-removing the appropriate registry entries by replacing the 
-<B
+>If you want to migrate an existing <TT
+CLASS="FILENAME"
+>printers.def</TT
+> 
+	file into the new setup, the current only solution is to use the Windows 
+	NT APW to install the NT drivers and the 9x  drivers.  This can be scripted 
+	using <B
 CLASS="COMMAND"
->stop</B
-> command above with <B
+>smbclient</B
+> and <B
 CLASS="COMMAND"
->start</B
->.</P
-><P
->Windows 9x clients will continue to use LanMan printing calls
-with a 2.2 Samba server so there is no need to perform any of these
-modifications on non-NT clients.</P
+>rpcclient</B
+>.  See the 
+	Imprints installation client at <A
+HREF="http://imprints.sourceforge.net/"
+TARGET="_top"
+>http://imprints.sourceforge.net/</A
+> 
+	for an example.
+	</P
+></LI
+></UL
 ><DIV
 CLASS="WARNING"
 ><P
@@ -902,8 +917,12 @@ ALIGN="CENTER"
 ><TD
 ALIGN="LEFT"
 ><P
->The following smb.conf parameters are considered to be depreciated and will 
-be removed soon.  Do not use them in new installations</P
+>The following <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> parameters are considered to 
+be deprecated and will be removed soon.  Do not use them in new 
+installations</P
 ><P
 ></P
 ><UL
@@ -943,63 +962,22 @@ CLASS="PARAMETER"
 ></TABLE
 ></DIV
 ><P
->Here are the possible scenarios for supporting migration:</P
-><P
-></P
-><UL
-><LI
-><P
->If you do not desire the new Windows NT 
-	print driver support, nothing needs to be done.  
-	All existing parameters work the same.</P
-></LI
-><LI
-><P
->If you want to take advantage of NT printer 
-	driver support but do not want to migrate the 
-	9x drivers to the new setup, the leave the existing 
-	printers.def file.  When smbd attempts to locate a 
-	9x driver for the printer in the TDB and fails it 
-	will drop down to using the printers.def (and all 
-	associated parameters).  The <B
-CLASS="COMMAND"
->make_printerdef</B
-> 
-	tool will also remain for backwards compatibility but will 
-	be moved to the "this tool is the old way of doing it" 
-	pile.</P
-></LI
-><LI
-><P
->If you install a Windows 9x driver for a printer 
-	on your Samba host (in the printing TDB), this information will 
-	take precedence and the three old printing parameters
-	will be ignored (including print driver location).</P
-></LI
-><LI
-><P
->If you want to migrate an existing <TT
-CLASS="FILENAME"
->printers.def</TT
-> 
-	file into the new setup, the current only solution is to use the Windows 
-	NT APW to install the NT drivers and the 9x  drivers.  This can be scripted 
-	using <B
-CLASS="COMMAND"
->smbclient</B
-> and <B
-CLASS="COMMAND"
->rpcclient</B
->.  See the 
-	Imprints installation client at <A
-HREF="http://imprints.sourceforge.net/"
-TARGET="_top"
->http://imprints.sourceforge.net/</A
-> 
-	for an example.
-	</P
-></LI
-></UL
+>The have been two new parameters add in Samba 2.2.2 to for 
+better support of Samba 2.0.x backwards capability (<TT
+CLASS="PARAMETER"
+><I
+>disable
+spoolss</I
+></TT
+>) and for using local printers drivers on Windows 
+NT/2000 clients (<TT
+CLASS="PARAMETER"
+><I
+>use client driver</I
+></TT
+>). Both of 
+these options are described in the smb.coinf(5) man page and are 
+disabled by default.</P
 ></DIV
 ></DIV
 ></BODY
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 33a05a4ecfd..7f1a44c835c 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -1953,18 +1953,6 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
-HREF="#NTACLSUPPORT"
-><TT
-CLASS="PARAMETER"
-><I
->nt acl support</I
-></TT
-></A
-></P
-></LI
-><LI
-><P
-><A
 HREF="#NTPIPESUPPORT"
 ><TT
 CLASS="PARAMETER"
@@ -3011,7 +2999,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN974"
+NAME="AEN970"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -3804,6 +3792,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#NTACLSUPPORT"
+><TT
+CLASS="PARAMETER"
+><I
+>nt acl support</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#ONLYGUEST"
 ><TT
 CLASS="PARAMETER"
@@ -12604,7 +12604,7 @@ CLASS="COMMAND"
 ><A
 NAME="NTACLSUPPORT"
 ></A
->nt acl support (G)</DT
+>nt acl support (S)</DT
 ><DD
 ><P
 >This boolean parameter controls whether 
@@ -12613,7 +12613,9 @@ HREF="smbd.8.html"
 TARGET="_top"
 >smbd(8)</A
 > will attempt to map 
-		UNIX permissions into Windows NT access control lists.</P
+		UNIX permissions into Windows NT access control lists.
+		This parameter was formally a global parameter in releases
+		prior to 2.2.2.</P
 ><P
 >Default: <B
 CLASS="COMMAND"