autogen from old updates

4 files changed, 55 insertions, 44 deletions

diff --git a/docs/htmldocs/Integrating-with-Windows.html b/docs/htmldocs/Integrating-with-Windows.html
index fbfad867bab..7c5fe316272 100644
--- a/docs/htmldocs/Integrating-with-Windows.html
+++ b/docs/htmldocs/Integrating-with-Windows.html
@@ -1001,7 +1001,7 @@ the procedure for creating an account.</P
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
->	# useradd -s /bin/bash -d /home/"userid" -m
+>	# useradd -s /bin/bash -d /home/"userid" -m "userid"
 	# passwd "userid"
 	  Enter Password: &lt;pw&gt;
 	  
@@ -1023,7 +1023,7 @@ controller.  Refer to the Samba-PDC-HOWTO for more details.</P
 ><P
 ><PRE
 CLASS="PROGRAMLISTING"
->	# useradd -a /bin/false -d /dev/null "machine_name"\$
+>	# useradd -s /bin/false -d /dev/null "machine_name"\$
 	# passwd -l "machine_name"\$
 	# smbpasswd -a -m "machine_name"</PRE
 ></P
diff --git a/docs/htmldocs/Samba-PDC-HOWTO.html b/docs/htmldocs/Samba-PDC-HOWTO.html
index 53c466ee247..f9bde088985 100644
--- a/docs/htmldocs/Samba-PDC-HOWTO.html
+++ b/docs/htmldocs/Samba-PDC-HOWTO.html
@@ -410,16 +410,11 @@ CLASS="FILENAME"
 >As Samba 2.2 does not offer a complete implementation of group mapping between 
 Windows NT groups and UNIX groups (this is really quite complicated to explain 
 in a short space), you should refer to the <A
-HREF="smb.conf.5.html#DOMAINADMINUSERS"
-TARGET="_top"
->domain 
-admin users</A
-> and <A
 HREF="smb.conf.5.html#DOMAINADMINGROUP"
 TARGET="_top"
 >domain 
 admin group</A
-> smb.conf parameters for information of creating a Domain Admins 
+> smb.conf parameter for information of creating "Domain Admins"
 style accounts.</P
 ></DIV
 ><DIV
@@ -427,7 +422,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN94"
+NAME="AEN93"
 >Creating Machine Trust Accounts and Joining Clients 
 to the Domain</A
 ></H1
@@ -485,7 +480,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN108"
+NAME="AEN107"
 >Manually creating machine trust accounts</A
 ></H2
 ><P
@@ -504,9 +499,20 @@ CLASS="PROMPT"
 >/usr/sbin/useradd -g 100 -d /dev/null -c <TT
 CLASS="REPLACEABLE"
 ><I
->machine_nickname</I
+>"machine 
+nickname"</I
 ></TT
-> -m -s /bin/false <TT
+> -s /bin/false <TT
+CLASS="REPLACEABLE"
+><I
+>machine_name</I
+></TT
+>$ </P
+><P
+><TT
+CLASS="PROMPT"
+>root# </TT
+>passwd -l <TT
 CLASS="REPLACEABLE"
 ><I
 >machine_name</I
@@ -616,7 +622,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN136"
+NAME="AEN138"
 >Creating machine trust accounts "on the fly"</A
 ></H2
 ><P
@@ -646,7 +652,7 @@ CLASS="EMPHASIS"
 <I
 CLASS="EMPHASIS"
 >SHOULD</I
-> be set to s different password that the 
+> be set to a different password that the 
 associated <TT
 CLASS="FILENAME"
 >/etc/passwd</TT
@@ -658,7 +664,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN147"
+NAME="AEN149"
 >Common Problems and Errors</A
 ></H1
 ><P
@@ -853,7 +859,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN195"
+NAME="AEN197"
 >System Policies and Profiles</A
 ></H1
 ><P
@@ -1015,7 +1021,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN239"
+NAME="AEN241"
 >What other help can I get ?</A
 ></H1
 ><P
@@ -1417,7 +1423,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN353"
+NAME="AEN355"
 >Domain Control for Windows 9x/ME</A
 ></H1
 ><DIV
@@ -1553,7 +1559,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN383"
+NAME="AEN385"
 >Configuration Instructions:	Network Logons</A
 ></H2
 ><P
@@ -1715,7 +1721,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN417"
+NAME="AEN419"
 >Configuration Instructions:	Setting up Roaming User Profiles</A
 ></H2
 ><DIV
@@ -1763,7 +1769,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN425"
+NAME="AEN427"
 >Windows NT Configuration</A
 ></H3
 ><P
@@ -1798,7 +1804,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN433"
+NAME="AEN435"
 >Windows 9X Configuration</A
 ></H3
 ><P
@@ -1829,7 +1835,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN441"
+NAME="AEN443"
 >Win9X and WinNT Configuration</A
 ></H3
 ><P
@@ -1858,7 +1864,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN448"
+NAME="AEN450"
 >Windows 9X Profile Setup</A
 ></H3
 ><P
@@ -1867,7 +1873,7 @@ as are folders "Start Menu", "Desktop", "Programs" and "Nethood".
 These directories and their contents will be merged with the local
 versions stored in c:\windows\profiles\username on subsequent logins,
 taking the most recent from each.  You will need to use the [global]
-options "preserve case = yes", "short case preserve = yes" and
+options "preserve case = yes", "short preserve case = yes" and
 "case sensitive = no" in order to maintain capital letters in shortcuts
 in any of the profile folders.</P
 ><P
@@ -2015,7 +2021,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN484"
+NAME="AEN486"
 >Windows NT Workstation 4.0</A
 ></H3
 ><P
@@ -2097,7 +2103,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN497"
+NAME="AEN499"
 >Windows NT Server</A
 ></H3
 ><P
@@ -2111,7 +2117,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN500"
+NAME="AEN502"
 >Sharing Profiles between W95 and NT Workstation 4.0</A
 ></H3
 ><DIV
@@ -2176,7 +2182,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN510"
+NAME="AEN512"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></H1
 ><DIV
diff --git a/docs/htmldocs/UNIX_INSTALL.html b/docs/htmldocs/UNIX_INSTALL.html
index f979e57b67a..7194e1154ec 100644
--- a/docs/htmldocs/UNIX_INSTALL.html
+++ b/docs/htmldocs/UNIX_INSTALL.html
@@ -736,20 +736,25 @@ NAME="AEN182"
 		The second is the "deny modes" that are specified when a file 
 		is open.</P
 ><P
->Samba supports "record locking" using the fcntl() unix system
-		call. This is often implemented using rpc calls to a rpc.lockd process
-		running on the system that owns the filesystem. Unfortunately many
-		rpc.lockd implementations are very buggy, particularly when made to
-		talk to versions from other vendors. It is not uncommon for the
-		rpc.lockd to crash.</P
-><P
->There is also a problem translating the 32 bit lock 
-		requests generated by PC clients to 31 bit requests supported 
-		by most unixes. Unfortunately many PC applications (typically 
-		OLE2 applications) use byte ranges with the top bit set 
-		as semaphore sets. Samba attempts translation to support 
-		these types of applications, and the translation has proved 
-		to be quite successful.</P
+>Record locking semantics under Unix is very
+		different from record locking under Windows. Versions
+		of Samba before 2.2 have tried to use the native
+		fcntl() unix system call to implement proper record
+		locking between different Samba clients. This can not
+		be fully correct due to several reasons. The simplest
+		is the fact that a Windows client is allowed to lock a
+		byte range up to 2^32 or 2^64, depending on the client
+		OS. The unix locking only supports byte ranges up to
+		2^31. So it is not possible to correctly satisfy a
+		lock request above 2^31. There are many more
+		differences, too many to be listed here.</P
+><P
+>Samba 2.2 and above implements record locking
+		completely independent of the underlying unix
+		system. If a byte range lock that the client requests
+		happens to fall into the range 0-2^31, Samba hands
+		this request down to the Unix system. All other locks
+		can not be seen by unix anyway.</P
 ><P
 >Strictly a SMB server should check for locks before 
 		every read and write call on a file. Unfortunately with the 
diff --git a/docs/htmldocs/printer_driver2.html b/docs/htmldocs/printer_driver2.html
index a4c76aad4e8..36d66c1c803 100644
--- a/docs/htmldocs/printer_driver2.html
+++ b/docs/htmldocs/printer_driver2.html
@@ -231,7 +231,7 @@ CLASS="PARAMETER"
 > is used to allow administrative 
 level user accounts to have write access in order to update files 
 on the share.  See the <A
-HREF="smb./conf.5.html"
+HREF="smb.conf.5.html"
 TARGET="_top"
 >smb.conf(5) 
 man page</A