Regen doco

1 files changed, 27 insertions, 9 deletions

diff --git a/docs/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index c8f97c89d13..dfcb71baed2 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -425,6 +425,15 @@ CLASS="FILENAME"
 >smb.conf(5)</TT
 > man page. </P
 ><P
+>This command can work both with and without the -U parameter. </P
+><P
+>When invoked with -U, that username (and optional password) are
+                used to contact the PDC (which must be specified with -r) to both
+                create a machine account, and to set a password on it.</P
+><P
+>Alternately, if -U is omitted, Samba will contact its PDC
+                and attempt to change the password on a pre-existing account. </P
+><P
 >In order to be used in this way, the Administrator for 
 		the Windows NT Domain must have used the program "Server Manager 
 		for Domains" to add the primary NetBIOS name of  the Samba server 
@@ -445,9 +454,10 @@ CLASS="PARAMETER"
 >password server</I
 ></TT
 > and change the machine account 
-		password used to create the secure Domain communication.  This 
-		password is then stored by smbpasswd in a TDB, writeable only by root, 
-		called <TT
+		password used to create the secure Domain communication.  </P
+><P
+>Either way, this password is then stored by smbpasswd in a TDB, 
+                writeable only by root, called <TT
 CLASS="FILENAME"
 >secrets.tdb</TT
 > </P
@@ -464,7 +474,12 @@ CLASS="COMMAND"
 ><P
 >Note that even though the authentication is being 
 		done to the PDC all users accessing the Samba server must still 
-		have a valid UNIX account on that machine. </P
+		have a valid UNIX account on that machine.  
+                The <B
+CLASS="COMMAND"
+>winbindd(8)</B
+> daemon can be used
+                to create UNIX accounts for NT users.</P
 ><P
 >This option is only available when running smbpasswd as root. 
 		</P
@@ -484,6 +499,9 @@ CLASS="PARAMETER"
 		the user name on that machine whose password will be changed. It 
 		is present to allow users who have different user names on 
 		different systems to change these passwords. </P
+><P
+>In particular, this parameter specifies the username
+                used to create the machine account when invoked with -j</P
 ></DD
 ><DT
 >-h</DT
@@ -516,7 +534,7 @@ CLASS="COMMAND"
 ><DD
 ><P
 >This parameter is only available is Samba
-		has been configured to use the experiemental
+		has been configured to use the experimental
 		<B
 CLASS="COMMAND"
 >--with-ldapsam</B
@@ -570,7 +588,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN182"
+NAME="AEN188"
 ></A
 ><H2
 >NOTES</H2
@@ -613,7 +631,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN192"
+NAME="AEN198"
 ></A
 ><H2
 >VERSION</H2
@@ -624,7 +642,7 @@ NAME="AEN192"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN195"
+NAME="AEN201"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -647,7 +665,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN201"
+NAME="AEN207"
 ></A
 ><H2
 >AUTHOR</H2