merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

1 files changed, 14 insertions, 16 deletions

diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 39281eb34e..47eabcaec8 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -1,9 +1,9 @@
-.\" 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" "5" "28 January 2002" "" ""
+.TH "SMBPASSWD" "5" "01 October 2002" "" ""
 .SH NAME
 smbpasswd \- The Samba encrypted password file
 .SH SYNOPSIS
@@ -11,7 +11,7 @@ smbpasswd \- The Samba encrypted password file
 \fIsmbpasswd\fR
 .SH "DESCRIPTION"
 .PP
-This tool is part of the  Sambasuite.
+This tool is part of the  Samba suite.
 .PP
 smbpasswd is the Samba encrypted password file. It contains 
 the username, Unix user id and the SMB hashed passwords of the 
@@ -39,7 +39,7 @@ this smbpasswd file entry as being valid for a user.
 .TP
 \fBLanman Password Hash\fR
 This is the LANMAN hash of the user's password, 
-encoded as 32 hex digits. The LANMAN hash is created by DES 
+encoded as 32 hex digits.  The LANMAN hash is created by DES 
 encrypting a well known string with the user's password as the 
 DES key. This is the same password used by Windows 95/98 machines. 
 Note that this password hash is regarded as weak as it is
@@ -66,7 +66,7 @@ other access.
 .TP
 \fBNT Password Hash\fR
 This is the Windows NT hash of the user's 
-password, encoded as 32 hex digits. The Windows NT hash is 
+password, encoded as 32 hex digits.  The Windows NT hash is 
 created by taking the user's password as represented in 
 16-bit, little-endian UNICODE and then applying the MD4 
 (internet rfc1321) hashing algorithm to it. 
@@ -108,12 +108,12 @@ in the smbpasswd file.
 \fBN\fR - This means the
 account has no password (the passwords in the fields LANMAN 
 Password Hash and NT Password Hash are ignored). Note that this 
-will only allow users to log on with no password if the \fI null passwords\fR parameter is set in the \fIsmb.conf(5)
-\fRconfig file. 
+will only allow users to log on with no password if the \fI   null passwords\fR parameter is set in the \fIsmb.conf(5)
+\fR config file. 
 .TP 0.2i
 \(bu
 \fBD\fR - This means the account 
-is disabled and no SMB/CIFS logins will be allowed for 
+is disabled and no SMB/CIFS logins  will be allowed for 
 this user. 
 .TP 0.2i
 \(bu
@@ -122,10 +122,9 @@ is a "Workstation Trust" account. This kind of account is used
 in the Samba PDC code stream to allow Windows NT Workstations 
 and Servers to join a Domain hosted by a Samba PDC. 
 .RE
-.PP
+
 Other flags may be added as the code is extended in future.
 The rest of this field space is filled in with spaces. 
-.PP
 .TP
 \fBLast Change Time\fR
 This field consists of the time the account was 
@@ -134,15 +133,14 @@ last modified. It consists of the characters 'LCT-' (standing for
 in seconds since the epoch (1970) that the last change was made. 
 .PP
 All other colon separated fields are ignored at this time.
-.PP
 .SH "VERSION"
 .PP
 This man page is correct for version 2.2 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
-\fBsmbpasswd(8)\fR, 
-samba(7), and
+\fBsmbpasswd(8)\fR 
+samba(7) and
 the Internet RFC1321 for details on the MD4 algorithm.
 .SH "AUTHOR"
 .PP
@@ -155,5 +153,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