merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

1 files changed, 33 insertions, 33 deletions

diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 1a841e53ce..ee097cf6f1 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -1,17 +1,18 @@
-.\" This manpage has been automatically generated by docbook2man-spec
-.\" from a DocBook document.  docbook2man-spec can be found at:
-.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBPASSWD" "8" "28 January 2002" "" ""
+.TH "SMBPASSWD" "8" "01 October 2002" "" ""
 .SH NAME
 smbpasswd \- change a user's SMB password
 .SH SYNOPSIS
-.sp
-\fBsmbpasswd\fR [ \fB-a\fR ]  [ \fB-x\fR ]  [ \fB-d\fR ]  [ \fB-e\fR ]  [ \fB-D debuglevel\fR ]  [ \fB-n\fR ]  [ \fB-r <remote machine>\fR ]  [ \fB-R <name resolve order>\fR ]  [ \fB-m\fR ]  [ \fB-j DOMAIN\fR ]  [ \fB-U username[%password]\fR ]  [ \fB-h\fR ]  [ \fB-s\fR ]  [ \fB-w pass\fR ]  [ \fBusername\fR ] 
+
+\fBsmbpasswd\fR [ \fB-a\fR ] [ \fB-x\fR ] [ \fB-d\fR ] [ \fB-e\fR ] [ \fB-D debuglevel\fR ] [ \fB-n\fR ] [ \fB-r <remote machine>\fR ] [ \fB-R <name resolve order>\fR ] [ \fB-m\fR ] [ \fB-U username[%password]\fR ] [ \fB-h\fR ] [ \fB-s\fR ] [ \fB-w pass\fR ] [ \fBusername\fR ]
+
 .SH "DESCRIPTION"
 .PP
-This tool is part of the  Sambasuite.
+This tool is part of the  Samba suite.
 .PP
 The smbpasswd program has several different 
 functions, depending on whether it is run by the \fBroot\fR 
@@ -30,7 +31,7 @@ succeed the smbd daemon must be running on the local machine. On a
 UNIX machine the encrypted SMB passwords are usually stored in 
 the \fIsmbpasswd(5)\fR file. 
 .PP
-When run by an ordinary user with no options. smbpasswd 
+When run by an ordinary user with no options, smbpasswd 
 will prompt them for their old SMB password and then ask them 
 for their new password twice, to ensure that the new password
 was typed correctly. No passwords will be echoed on the screen 
@@ -40,7 +41,7 @@ the <Enter> key when asked for your old password.
 .PP
 smbpasswd can also be used by a normal user to change their
 SMB password on remote machines, such as Windows NT Primary Domain 
-Controllers. See the (-r) and -U options below. 
+Controllers.   See the (-r) and -U options below. 
 .PP
 When run by root, smbpasswd allows new users to be added 
 and deleted in the smbpasswd file, as well as allows changes to 
@@ -56,7 +57,7 @@ following should be added to the local smbpasswd file, with the
 new password typed (type <Enter> for the old password). This 
 option is ignored if the username following already exists in 
 the smbpasswd file and it is treated like a regular change 
-password command. Note that the default passdb backends require 
+password command.  Note that the default passdb backends require 
 the user to already exist in the system password file (usually 
 \fI/etc/passwd\fR), else the request to add the 
 user will fail. 
@@ -82,7 +83,7 @@ will fail.
 If the smbpasswd file is in the 'old' format (pre-Samba 2.0 
 format) there is no space in the user's password entry to write
 this information and the command will FAIL. See \fBsmbpasswd(5)
-\fRfor details on the 'old' and new password file formats.
+\fR for details on the 'old' and new password file formats.
 
 This option is only available when running smbpasswd as 
 root.
@@ -94,7 +95,7 @@ if the account was previously disabled. If the account was not
 disabled this option has no effect. Once the account is enabled then 
 the user will be able to authenticate via SMB once again. 
 
-If the smbpasswd file is in the 'old' format, then \fB smbpasswd\fR will FAIL to enable the account. 
+If the smbpasswd file is in the 'old' format, then \fB  smbpasswd\fR will FAIL to enable the account.  
 See \fBsmbpasswd (5)\fR for 
 details on the 'old' and new password file formats. 
 
@@ -102,7 +103,7 @@ This option is only available when running smbpasswd as root.
 .TP
 \fB-D debuglevel\fR
 \fIdebuglevel\fR is an integer 
-from 0 to 10. The default value if this parameter is not specified 
+from 0 to 10.  The default value if this parameter is not specified 
 is zero. 
 
 The higher this value, the more detail will be logged to the 
@@ -155,21 +156,21 @@ change).
 
 \fBNote\fR that Windows 95/98 do not have 
 a real password database so it is not possible to change passwords 
-specifying a Win95/98 machine as remote machine target. 
+specifying a Win95/98  machine as remote machine target. 
 .TP
 \fB-R name resolve order\fR
-This option allows the user of smbpasswd to determine 
+This option allows the user of smbpasswd to determine
 what name resolution services to use when looking up the NetBIOS
 name of the host being connected to. 
 
-The options are :"lmhosts", "host", "wins" and "bcast". They cause 
-names to be resolved as follows : 
+The options are :"lmhosts", "host", "wins" and "bcast". They
+cause names to be resolved as follows : 
 .RS
 .TP 0.2i
 \(bu
 lmhosts : Lookup an IP 
 address in the Samba lmhosts file. If the line in lmhosts has 
-no name type attached to the NetBIOS name (see the lmhosts(5)for details) then
+no name type attached to the NetBIOS name (see the lmhosts(5) for details) then
 any name type matches for lookup.
 .TP 0.2i
 \(bu
@@ -178,14 +179,14 @@ name to IP address resolution, using the system \fI/etc/hosts
 \fR, NIS, or DNS lookups. This method of name resolution 
 is operating system depended for instance on IRIX or Solaris this 
 may be controlled by the \fI/etc/nsswitch.conf\fR 
-file). Note that this method is only used if the NetBIOS name 
+file).  Note that this method is only used if the NetBIOS name 
 type being queried is the 0x20 (server) name type, otherwise 
 it is ignored.
 .TP 0.2i
 \(bu
 wins : Query a name with 
 the IP address listed in the \fIwins server\fR 
-parameter. If no WINS server has been specified this method 
+parameter.  If no WINS server has been specified this method 
 will be ignored.
 .TP 0.2i
 \(bu
@@ -195,19 +196,18 @@ each of the known local interfaces listed in the
 reliable of the name resolution methods as it depends on the 
 target host being on a locally connected subnet.
 .RE
-.PP
+
 The default order is \fBlmhosts, host, wins, bcast\fR 
 and without this parameter or any entry in the 
 \fIsmb.conf\fR file the name resolution methods will 
 be attempted in this order. 
-.PP
 .TP
 \fB-m\fR
 This option tells smbpasswd that the account 
 being changed is a MACHINE account. Currently this is used 
 when Samba is being used as an NT Primary Domain Controller.
 
-This option is only available when running smbpasswd as root. 
+This option is only available when running smbpasswd as root.
 .TP
 \fB-U username\fR
 This option may only be used in conjunction 
@@ -218,26 +218,26 @@ is present to allow users who have different user names on
 different systems to change these passwords. 
 .TP
 \fB-h\fR
-This option prints the help string for \fB smbpasswd\fR, selecting the correct one for running as root 
+This option prints the help string for \fB  smbpasswd\fR, selecting the correct one for running as root 
 or as an ordinary user. 
 .TP
 \fB-s\fR
 This option causes smbpasswd to be silent (i.e. 
 not issue prompts) and to read its old and new passwords from 
-standard input, rather than from \fI/dev/tty\fR 
+standard  input, rather than from \fI/dev/tty\fR 
 (like the \fBpasswd(1)\fR program does). This option 
 is to aid people writing scripts to drive smbpasswd
 .TP
 \fB-w password\fR
-This parameter is only available is Samba
-has been configured to use the experiemental
+This parameter is only available if Samba
+has been configured to use the experimental
 \fB--with-ldapsam\fR option. The \fI-w\fR 
 switch is used to specify the password to be used with the 
 \fIldap admin 
-dn\fR. Note that the password is stored in
+dn\fR  Note that the password is stored in
 the \fIprivate/secrets.tdb\fR and is keyed off 
-of the admin's DN. This means that if the value of \fIldap
-admin dn\fR ever changes, the password will beed to be 
+of the admin's DN.  This means that if the value of \fIldap
+admin dn\fR ever changes, the password will need to be 
 manually updated as well.
 .TP
 \fBusername\fR
@@ -248,7 +248,7 @@ to modify attributes directly in the local smbpasswd file.
 .SH "NOTES"
 .PP
 Since \fBsmbpasswd\fR works in client-server 
-mode communicating with a local smbd for a non-root user then 
+mode communicating  with a local smbd for a non-root user then 
 the smbd daemon must be running for this to work. A common problem 
 is to add a restriction to the hosts that may access the \fB smbd\fR running on the local machine by specifying a 
 \fIallow hosts\fR or \fIdeny hosts\fR 
@@ -265,7 +265,7 @@ This man page is correct for version 3.0 of
 the Samba suite.
 .SH "SEE ALSO"
 .PP
-\fIsmbpasswd(5)\fR, 
+\fIsmbpasswd(5)\fR 
 samba(7)
 .SH "AUTHOR"
 .PP
@@ -278,5 +278,5 @@ The original Samba man pages were written by Karl Auer.
 The man page sources were converted to YODL format (another 
 excellent piece of Open Source software, available at
 ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
-release by Jeremy Allison. The conversion to DocBook for 
+release by Jeremy Allison.  The conversion to DocBook for 
 Samba 2.2 was done by Gerald Carter