mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 8 insertions, 8 deletions

diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 1b2796e789..f0145c19ca 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBPASSWD" "5" "24 April 2001" "" ""
+.TH "SMBPASSWD" "5" "10 October 2001" "" ""
 .SH NAME
 smbpasswd \- The Samba encrypted password file
 .SH SYNOPSIS
@@ -38,9 +38,9 @@ If this does not match then Samba will refuse to recognize
 this smbpasswd file entry as being valid for a user. 
 .TP
 \fBLanman Password Hash\fR
-This is the LANMAN hash of the users password, 
+This is the LANMAN hash of the user's password, 
 encoded as 32 hex digits. The LANMAN hash is created by DES 
-encrypting a well known string with the users password as the 
+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
 vulnerable to dictionary attacks and if two users choose the 
@@ -48,7 +48,7 @@ same password this entry will be identical (i.e. the password
 is not "salted" as the UNIX password is). If the user has a 
 null password this field will contain the characters "NO PASSWORD" 
 as the start of the hex string. If the hex string is equal to 
-32 'X' characters then the users account is marked as 
+32 'X' characters then the user's account is marked as 
 disabled and the user will not be able to 
 log onto the Samba server. 
 
@@ -65,14 +65,14 @@ itself must be set to be read/write only by root, with no
 other access. 
 .TP
 \fBNT Password Hash\fR
-This is the Windows NT hash of the users 
+This is the Windows NT hash of the user's 
 password, encoded as 32 hex digits. The Windows NT hash is 
-created by taking the users password as represented in 
+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. 
 
 This password hash is considered more secure than
-the Lanman Password Hash as it preserves the case of the 
+the LANMAN Password Hash as it preserves the case of the 
 password and uses a much higher quality hashing algorithm. 
 However, it is still the case that if two users choose the same 
 password this entry will be identical (i.e. the password is 
@@ -106,7 +106,7 @@ in the smbpasswd file.
 .TP 0.2i
 \(bu
 \fBN\fR - This means the
-account has no password (the passwords in the fields Lanman 
+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.