Update for 2.0beta1.

Jeremy.
(This used to be commit 598d0255d40da29ebab3d1a3c9eb66ba654db7b5)

19 files changed, 338 insertions, 374 deletions

diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index f9bc2b0659..b86624f848 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -1,4 +1,4 @@
-.TH "lmhosts" "5" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "lmhosts " "5" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 lmhosts \- The Samba NetBIOS hosts file
@@ -11,7 +11,7 @@ lmhosts is the \fBSamba\fP NetBIOS name to IP address mapping file\&.
 .PP 
 This file is part of the \fBSamba\fP suite\&.
 .PP 
-lmhosts is the \fBSamba\fP NetBIOS name to IP address mapping file\&.  It
+\fBlmhosts\fP is the \fBSamba\fP NetBIOS name to IP address mapping file\&.  It
 is very similar to the \fB/etc/hosts\fP file format, except that the
 hostname component must correspond to the NetBIOS naming format\&.
 .PP 
@@ -38,21 +38,18 @@ name type in the lookup\&.
 .PP 
 An example follows :
 .PP 
-
-.DS 
- 
-
-
-#
-# Sample Samba lmhosts file\&.
-#
-192\&.9\&.200\&.1	TESTPC
-192\&.9\&.200\&.20	NTSERVER#20
-192\&.9\&.200\&.21	SAMBASERVER
-
-.DE 
- 
-
+# 
+.br 
+# Sample Samba lmhosts file\&. 
+.br 
+# 
+.br 
+192\&.9\&.200\&.1	TESTPC 
+.br 
+192\&.9\&.200\&.20	NTSERVER#20 
+.br 
+192\&.9\&.200\&.21	SAMBASERVER 
+.br 
 .PP 
 Contains three IP to NetBIOS name mappings\&. The first and third will
 be returned for any queries for the names \f(CW"TESTPC"\fP and
@@ -79,7 +76,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba\&.anu\&.edu\&.au)\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1
index 9e79702761..36268ffd0c 100644
--- a/docs/manpages/make_smbcodepage.1
+++ b/docs/manpages/make_smbcodepage.1
@@ -1,4 +1,4 @@
-.TH "make_smbcodepage" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "make_smbcodepage " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 make_codepage \- Construct a codepage file for Samba
@@ -18,17 +18,17 @@ with the internationalization features of Samba 2\&.0
 .PP 
 .IP 
 .IP "c|d" 
-This tells make_smbcodepage if it is compiling (c) a text
-format code page file to binary, or (d) de-compiling a binary codepage
+This tells \fBmake_smbcodepage\fP if it is compiling (\fBc\fP) a text
+format code page file to binary, or (\fBd\fP) de-compiling a binary codepage
 file to text\&.
 .IP 
 .IP "codepage" 
-This is the codepage we are processing (a number, eg\&. 850)\&.
+This is the codepage we are processing (a number, e\&.g\&. 850)\&.
 .IP 
 .IP "inputfile" 
-This is the input file to process\&. In the \'c\' case this
+This is the input file to process\&. In the \'\fBc\fP\' case this
 will be a text codepage definition file such as the ones found in the
-Samba \fIsource/codepages\fP directory\&. In the \'d\' case this will be the
+Samba \fIsource/codepages\fP directory\&. In the \'\fBd\fP\' case this will be the
 binary format codepage definition file normally found in the
 \fIlib/codepages\fP directory in the Samba install directory path\&.
 .IP 
@@ -42,9 +42,9 @@ A text Samba codepage definition file is a description that tells
 Samba how to map from upper to lower case for characters greater than
 ascii 127 in the specified DOS code page\&.  Note that for certain DOS
 codepages (437 for example) mapping from lower to upper case may be
-asynchronous\&. For example, in code page 437 lower case a acute maps to
-a plain upper case A when going from lower to upper case, but maps
-from plain upper case A to plain lower case a when lower casing a
+non-symmetrical\&. For example, in code page 437 lower case a acute maps to
+a plain upper case A when going from lower to upper case, but
+plain upper case A maps to plain lower case a when lower casing a
 character\&.
 .PP 
 A binary Samba codepage definition file is a binary representation of
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index ec45574116..507a312029 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -22,21 +22,21 @@ SMB/CIFS clients, when they start up, may wish to locate an SMB/CIFS
 server\&. That is, they wish to know what IP number a specified host is
 using\&.
 .PP 
-Amongst other services, this program will listen for such requests,
+Amongst other services, \fBnmbd\fP will listen for such requests,
 and if its own NetBIOS name is specified it will respond with the IP
 number of the host it is running on\&.  Its "own NetBIOS name" is by
 default the primary DNS name of the host it is running on, but this
-can be overriden with the \fB-n\fP option (see \fIOPTIONS\fP below)\&. Thus
-nmbd will reply to broadcast queries for its own name(s)\&. Additional
-names for nmbd to respond on can be set via parameters in the
-\fBsmb\&.conf (5)\fP configuration file\&.
+can be overridden with the \fB-n\fP option (see OPTIONS below)\&. Thus
+\fBnmbd\fP will reply to broadcast queries for its own name(s)\&. Additional
+names for \fBnmbd\fP to respond on can be set via parameters in the
+\fBsmb\&.conf(5)\fP configuration file\&.
 .PP 
-nmbd can also be used as a WINS (Windows Internet Name Server)
+\fBnmbd\fP can also be used as a WINS (Windows Internet Name Server)
 server\&. What this basically means is that it will act as a WINS
 database server, creating a database from name registration requests
 that it receives and replying to queries from clients for these names\&.
 .PP 
-In addition, nmbd can act as a WINS proxy, relaying broadcast queries
+In addition, \fBnmbd\fP can act as a WINS proxy, relaying broadcast queries
 from clients that do not understand how to talk the WINS protocol to a
 WIN server\&.
 .PP 
@@ -44,9 +44,9 @@ WIN server\&.
 .PP 
 .IP 
 .IP "\fB-D\fP" 
-If specified, this parameter causes the server to operate
+If specified, this parameter causes \fBnmbd\fP to operate
 as a daemon\&. That is, it detaches itself and runs in the background,
-fielding requests on the appropriate port\&. By default, the server will
+fielding requests on the appropriate port\&. By default, \fBnmbd\fP will
 NOT operate as a daemon\&. nmbd can also be operated from the inetd
 meta-daemon, although this is not recommended\&.
 .IP 
@@ -64,16 +64,17 @@ NetBIOS lmhosts file\&.
 .IP 
 The lmhosts file is a list of NetBIOS names to IP addresses that is
 loaded by the nmbd server and used via the name resolution mechanism
-\fIname resolve order\fP described in \fBsmbd\&.conf (5)\fP to resolve any
+\fBname resolve order\fP described in 
+\fBsmb\&.conf (5)\fP to resolve any
 NetBIOS name queries needed by the server\&. Note that the contents of
-this file are \fINOT\fP used by nmbd to answer any name queries, adding
+this file are \fINOT\fP used by \fBnmbd\fP to answer any name queries\&. Adding
 a line to this file affects name NetBIOS resolution from this host
 \fIONLY\fP\&.
 .IP 
 The default path to this file is compiled into Samba as part of the
 build process\&. Common defaults are \fI/usr/local/samba/lib/lmhosts\fP,
-\fI/usr/samba/lib/lmhosts\fP or \fI/etc/lmhosts\fP\&. See the \fBlmhosts
-(5)\fP man page for details on the contents of this file\&.
+\fI/usr/samba/lib/lmhosts\fP or \fI/etc/lmhosts\fP\&. See the 
+\fBlmhosts (5)\fP man page for details on the contents of this file\&.
 .IP 
 .IP "\fB-d debuglevel\fP" 
 debuglevel is an integer from 0 to 10\&.
@@ -103,7 +104,7 @@ extension "\&.nmb" to the specified base name\&.  For example, if the name
 specified was "log" then the file log\&.nmb would contain the debugging
 data\&.
 .IP 
-The default log file path is is compiled into Samba as part of the
+The default log file path is compiled into Samba as part of the
 build process\&. Common defaults are \fI/usr/local/samba/var/log\&.nmb\fP,
 \fI/usr/samba/var/log\&.nmb\fP or \fI/var/log/log\&.nmb\fP\&.
 .IP 
@@ -118,7 +119,7 @@ but will override the setting in the \fBsmb\&.conf\fP file\&.
 UDP port number is a positive integer value\&.
 .IP 
 This option changes the default UDP port number (normally 137) that
-nmbd responds to name queries on\&. Don\'t use this option unless you are
+\fBnmbd\fP responds to name queries on\&. Don\'t use this option unless you are
 an expert, in which case you won\'t need help!
 .IP 
 .IP "\fB-s configuration file\fP" 
@@ -130,7 +131,7 @@ The file specified contains the configuration details required by the
 server\&. See \fBsmb\&.conf (5)\fP for more information\&.
 .IP 
 .IP "\fB-i scope\fP" 
-This specifies a NetBIOS scope that the server will use
+This specifies a NetBIOS scope that \fBnmbd\fP will use
 to communicate with when generating NetBIOS names\&. For details on the
 use of NetBIOS scopes, see rfc1001\&.txt and rfc1002\&.txt\&. NetBIOS scopes
 are \fIvery\fP rarely used, only set this parameter if you are the
@@ -138,7 +139,7 @@ system administrator in charge of all the NetBIOS systems you
 communicate with\&.
 .IP 
 .IP "\fB-h\fP" 
-Prints the help information (usage) for nmbd\&.
+Prints the help information (usage) for \fBnmbd\fP\&.
 .IP 
 .PP 
 .SH "FILES" 
@@ -150,14 +151,15 @@ contain suitable startup information for the meta-daemon\&.
 .PP 
 \fB/etc/rc\fP
 .PP 
-(or whatever initialisation script your system uses)\&.
+(or whatever initialization script your system uses)\&.
 .PP 
 If running the server as a daemon at startup, this file will need to
 contain an appropriate startup sequence for the server\&.
 .PP 
 \fB/usr/local/samba/lib/smb\&.conf\fP
 .PP 
-This is the default location of the \fIsmb\&.conf\fP server configuration
+This is the default location of the 
+\fBsmb\&.conf\fP server configuration
 file\&. Other common places that systems install this file are
 \fI/usr/samba/lib/smb\&.conf\fP and \fI/etc/smb\&.conf\fP\&.
 .PP 
@@ -173,18 +175,18 @@ configured under wherever Samba was configured to install itself\&.
 .PP 
 .SH "SIGNALS" 
 .PP 
-To shut down an nmbd process it is recommended that SIGKILL (-9)
+To shut down an \fBnmbd\fP process it is recommended that SIGKILL (-9)
 \fINOT\fP be used, except as a last resort, as this may leave the name
-database in an inconsistant state\&. The correct way to terminate
-nmbd is to send it a SIGTERM (-15) signal and wait for it to die on
+database in an inconsistent state\&. The correct way to terminate
+\fBnmbd\fP is to send it a SIGTERM (-15) signal and wait for it to die on
 its own\&.
 .PP 
-nmbd will accept SIGHUP, which will cause it to dump out it\'s
-namelists into the file namelist\&.debug in the
+\fBnmbd\fP will accept SIGHUP, which will cause it to dump out it\'s
+namelists into the file \f(CWnamelist\&.debug\fP in the
 \fI/usr/local/samba/var/locks\fP directory (or the \fIvar/locks\fP
 directory configured under wherever Samba was configured to install
-itself)\&. This will also cause nmbd to dump out it\'s server database in
-the log\&.nmb file\&. In addition, the the debug log level of nmbd may be raised
+itself)\&. This will also cause \fBnmbd\fP to dump out it\'s server database in
+the log\&.nmb file\&. In addition, the debug log level of nmbd may be raised
 by sending it a SIGUSR1 (\f(CWkill -USR1 <nmbd-pid>\fP) and lowered by sending it a
 SIGUSR2 (\f(CWkill -USR2 <nmbd-pid>\fP)\&. This is to allow transient
 problems to be diagnosed, whilst still running at a normally low log
@@ -207,7 +209,7 @@ http://samba\&.anu\&.edu\&.au/cifs/\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba\&.anu\&.edu\&.au)\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 12367f9efd..90b1864409 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -1,4 +1,4 @@
-.TH "nmblookup" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "nmblookup " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names
@@ -13,7 +13,7 @@ This program is part of the \fBSamba\fP suite\&.
 .PP 
 \fBnmblookup\fP is used to query NetBIOS names and map them to IP
 addresses in a network using NetBIOS over TCP/IP queries\&. The options
-allow the name queries to be directed at a particlar IP broadcast area
+allow the name queries to be directed at a particular IP broadcast area
 or to a particular machine\&. All queries are done over UDP\&.
 .PP 
 .SH "OPTIONS" 
@@ -33,13 +33,14 @@ rfc1002 for details\&.
 .IP 
 .IP "\fB-S\fP" 
 Once the name query has returned an IP address then do a
-node status query as well\&.
+node status query as well\&. A node status query returns the NetBIOS names 
+registered by a host\&.
 .IP 
 .IP "\fB-r\fP" 
 Try and bind to UDP port 137 to send and receive UDP
 datagrams\&. The reason for this option is a bug in Windows 95 where it
 ignores the source port of the requesting packet and only replies to
-UDP port 137\&. Unfortunately, on most UNIX systems root privillage is
+UDP port 137\&. Unfortunately, on most UNIX systems root privilage is
 needed to bind to this port, and in addition, if the
 \fBnmbd\fP daemon is running on this machine it also
 binds to this port\&.
@@ -84,12 +85,12 @@ level\fP parameter in the \fBsmb\&.conf
 .IP 
 .IP "\fB-s smb\&.conf\fP" 
 This parameter specifies the pathname to the
-Samba configuration file, smb\&.conf\&. This file controls all aspects of
-the Samba setup on the machine and smbclient also needs to read this
-file\&.
+Samba configuration file, \fBsmb\&.conf\fP\&. 
+This file controls all aspects of
+the Samba setup on the machine\&.
 .IP 
 .IP "\fB-i scope\fP" 
-This specifies a NetBIOS scope that smbclient will use
+This specifies a NetBIOS scope that \fBnmblookup\fP will use
 to communicate with when generating NetBIOS names\&. For details on the
 use of NetBIOS scopes, see rfc1001\&.txt and rfc1002\&.txt\&. NetBIOS scopes
 are \fIvery\fP rarely used, only set this parameter if you are the
@@ -100,14 +101,15 @@ communicate with\&.
 This is the NetBIOS name being queried\&. Depending upon
 the previous options this may be a NetBIOS name or IP address\&. If a
 NetBIOS name then the different name types may be specified by
-appending \f(CW#<type>\fP to the name\&.
+appending \f(CW#<type>\fP to the name\&. This name may also be \f(CW"*"\fP,
+which will return all registered names within a broadcast area\&.
 .IP 
 .PP 
 .SH "EXAMPLES" 
 .PP 
-\fBnmblookup\fP can be used to query a WINS server (in the same way \&.B
-nslookup is used to query DNS servers)\&. To query a WINS server,
-nmblookup must be called like this:
+\fBnmblookup\fP can be used to query a WINS server (in the same way
+\fBnslookup\fP is used to query DNS servers)\&. To query a WINS server,
+\fBnmblookup\fP must be called like this:
 .PP 
 \f(CWnmblookup -U server -R \'name\'\fP
 .PP 
@@ -130,7 +132,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba\&.anu\&.edu\&.au)\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 11c126fb8f..f48d7aaf3f 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -1,4 +1,4 @@
-.TH "Samba" "7" "23 Oct 1998" "Samba" "" 
+.TH "Samba " "7" "23 Oct 1998" "Samba" "" 
 .PP 
 .SH "NAME" 
 Samba \- A Windows SMB/CIFS fileserver for UNIX
@@ -9,7 +9,7 @@ Samba \- A Windows SMB/CIFS fileserver for UNIX
 .SH "DESCRIPTION" 
 .PP 
 The Samba software suite is a collection of programs that implements
-the Server Message Block(commenly abbreviated as SMB) protocol for
+the Server Message Block(commonly abbreviated as SMB) protocol for
 UNIX systems\&. This protocol is sometimes also referred to as the
 Common Internet File System (CIFS), LanManager or NetBIOS protocol\&.
 .PP 
@@ -19,7 +19,8 @@ The Samba suite is made up of several components\&. Each component is
 described in a separate manual page\&. It is strongly recommended that
 you read the documentation that comes with Samba and the manual pages
 of those components that you use\&. If the manual pages aren\'t clear
-enough then please send a patch to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+enough then please send a patch or bug report
+to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
 .PP 
 .IP 
 .IP "\fBsmbd\fP" 
@@ -67,8 +68,8 @@ in your printcap file\&.
 .br 
 .br 
 The \fBsmbstatus\fP
-(1) utility allows you to tell who is currently
-using the \fBsmbd (8)\fP server\&.
+(1) utility allows you list current connections to the 
+\fBsmbd (8)\fP server\&.
 .IP 
 .IP "\fBnmblookup\fP" 
 .br 
@@ -98,7 +99,7 @@ passwords on Samba and Windows NT(tm) servers\&.
 The Samba software suite is licensed under the GNU Public License
 (GPL)\&. A copy of that license should have come with the package in the
 file COPYING\&. You are encouraged to distribute copies of the Samba
-suite, but please keep obey the terms of this license\&.
+suite, but please obey the terms of this license\&.
 .PP 
 The latest version of the Samba suite can be obtained via anonymous
 ftp from samba\&.anu\&.edu\&.au in the directory pub/samba/\&. It is
@@ -128,7 +129,7 @@ for details on how to do this\&.
 If you have patches to submit or bugs to report then you may mail them
 directly to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Note, however, that due to
 the enormous popularity of this package the Samba Team may take some
-time to repond to mail\&. We prefer patches in \fIdiff -u\fP format\&.
+time to respond to mail\&. We prefer patches in \fIdiff -u\fP format\&.
 .PP 
 .SH "CREDITS" 
 .PP 
@@ -141,7 +142,7 @@ for the contributors to Samba post-CVS\&. CVS is the Open Source source
 code control system used by the Samba Team to develop Samba\&. The
 project would have been unmanageable without it\&.
 .PP 
-In addition, several commercial organisations now help fund the Samba
+In addition, several commercial organizations now help fund the Samba
 Team with money and equipment\&. For details see the Samba Web pages at
 http://samba\&.anu\&.edu\&.au/samba/samba-thanks\&.html\&.
 .PP 
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 818b26814f..0c7229ce20 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -1,4 +1,4 @@
-.TH "smb\&.conf" "5" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smb\&.conf " "5" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smb\&.conf \- The configuration file for the Samba suite
@@ -74,7 +74,7 @@ them\&. The client provides the username\&. As older clients only provide
 passwords and not usernames, you may specify a list of usernames to
 check against the password using the \fB"user="\fP option in
 the share definition\&. For modern clients such as Windows 95/98 and
-Windows NT, this should not be neccessary\&.
+Windows NT, this should not be necessary\&.
 .PP 
 Note that the access rights granted by the server are masked by the
 access rights granted to the specified or guest UNIX user by the host
@@ -92,7 +92,7 @@ the share name "foo":
 
  	[foo]
  		path = /home/bar
- 		writable = true
+ 		writeable = true
 
 
 .DE 
@@ -179,7 +179,7 @@ following is a typical and suitable [homes] section:
  
 
  	[homes]
- 		writable = yes
+ 		writeable = yes
 
 .DE 
  
@@ -232,7 +232,7 @@ given, the username is set to the located printer name\&.
 Note that the [printers] service MUST be printable - if you specify
 otherwise, the server will refuse to load the configuration file\&.
 .IP 
-Typically the path specified would be that of a world-writable spool
+Typically the path specified would be that of a world-writeable spool
 directory with the sticky bit set on it\&. A typical [printers] entry
 would look like this:
 .IP 
@@ -242,7 +242,7 @@ would look like this:
 
  	[printers]
  		path = /usr/spool/public
- 		writable = no
+ 		writeable = no
  		guest ok = yes
  		printable = yes 
 
@@ -266,7 +266,7 @@ this:
 .IP 
 Each alias should be an acceptable printer name for your printing
 subsystem\&. In the \fB[global]\fP section, specify the new
-file as your printcap\&.  The server will then only recognise names
+file as your printcap\&.  The server will then only recognize names
 found in your pseudo-printcap, which of course can contain whatever
 aliases you like\&. The same technique could be used simply to limit
 access to a subset of your local printers\&.
@@ -280,7 +280,7 @@ NOTE: On SYSV systems which use lpstat to determine what printers are
 defined on the system you may be able to use \fB"printcap name =
 lpstat"\fP to automatically obtain a list of
 printers\&. See the \fB"printcap name"\fP option for
-more detils\&.
+more details\&.
 .IP 
 .PP 
 .SH "PARAMETERS" 
@@ -288,8 +288,8 @@ more detils\&.
 Parameters define the specific attributes of sections\&.
 .PP 
 Some parameters are specific to the \fB[global]\fP section
-(eg\&., \fBsecurity\fP)\&.  Some parameters are usable in
-all sections (eg\&., \fBcreate mode\fP)\&. All others are
+(e\&.g\&., \fBsecurity\fP)\&.  Some parameters are usable in
+all sections (e\&.g\&., \fBcreate mode\fP)\&. All others are
 permissible only in normal sections\&. For the purposes of the following
 descriptions the \fB[homes]\fP and
 \fB[printers]\fP sections will be considered normal\&.
@@ -298,7 +298,7 @@ specific to the \fB[global]\fP section\&. The letter \f(CW\'S\'\fP
 indicates that a parameter can be specified in a service specific
 section\&. Note that all \f(CW\'S\'\fP parameters can also be specified in the
 \fB[global]\fP section - in which case they will define
-the default behaviour for all services\&.
+the default behavior for all services\&.
 .PP 
 Parameters are arranged here in alphabetical order - this may not
 create best bedfellows, but at least you can find them! Where there
@@ -375,8 +375,8 @@ negotiation\&. It can be one of CORE, COREPLUS, LANMAN1, LANMAN2 or NT1\&.
 .IP 
 .IP o 
 \fB%a\fP = the architecture of the remote
-machine\&. Only some are recognised, and those may not be 100%
-reliable\&. It currently recognises Samba, WfWg, WinNT and
+machine\&. Only some are recognized, and those may not be 100%
+reliable\&. It currently recognizes Samba, WfWg, WinNT and
 Win95\&. Anything else will be known as "UNKNOWN"\&. If it gets it wrong
 then sending a level 3 log to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP
 should allow it to be fixed\&.
@@ -1306,7 +1306,7 @@ regardless if the owner of the file is the currently logged on user or not\&.
 This specifies what type of server \fBnmbd\fP will
 announce itself as, to a network neighborhood browse list\&. By default
 this is set to Windows NT\&. The valid options are : "NT", "Win95" or
-"WfW" meaining Windows NT, Windows 95 and Windows for Workgroups
+"WfW" meaning Windows NT, Windows 95 and Windows for Workgroups
 respectively\&. Do not change this parameter unless you have a specific
 need to stop Samba appearing as an NT server as this may prevent Samba
 servers from participating as browser servers correctly\&.
@@ -1388,7 +1388,7 @@ the interface list given in the \fB\'interfaces\'\fP
 parameter\&. This restricts the networks that \fBsmbd\fP
 will serve to packets coming in those interfaces\&.  Note that you
 should not use this parameter for machines that are serving PPP or
-other intermittant or non-broadcast network interfaces as it will not
+other intermittent or non-broadcast network interfaces as it will not
 cope with non-permanent interfaces\&.
 .IP 
 In addition, to change a users SMB password, the
@@ -1433,16 +1433,9 @@ This parameter can be set per share\&.
 \fBExample:\fP
 \f(CW	blocking locks = False\fP
 .IP 
-.IP "\fBbroweable (S)\fP" 
+.IP "\fBbrowseable (S)\fP" 
 .IP 
-This controls whether this share is seen in the list of available
-shares in a net view and in the browse list\&.
-.IP 
-\fBDefault:\fP
-\f(CW	browsable = Yes\fP
-.IP 
-\fBExample:\fP
-\f(CW	browsable = No\fP
+Synonym for \fBbrowseable\fP\&.
 .IP 
 .IP "\fBbrowse list(G)\fP" 
 .IP 
@@ -1455,7 +1448,14 @@ should never need to change this\&.
 .IP 
 .IP "\fBbrowseable\fP" 
 .IP 
-Synonym for \fBbrowsable\fP\&.
+This controls whether this share is seen in the list of available
+shares in a net view and in the browse list\&.
+.IP 
+\fBDefault:\fP
+\f(CW	browseable = Yes\fP
+.IP 
+\fBExample:\fP
+\f(CW	browseable = No\fP
 .IP 
 .IP "\fBcase sensitive (G)\fP" 
 .IP 
@@ -1549,7 +1549,7 @@ described more fully in the manual page \fBmake_smbcodepage
 to map lower to upper case characters to provide the case insensitivity
 of filenames that Windows clients expect\&.
 .IP 
-Samba currenly ships with the following code page files :
+Samba currently ships with the following code page files :
 .IP 
 .IP 
 .IP o 
@@ -1642,12 +1642,12 @@ Shift-JIS to JUNET code with different shift-in, shift out codes\&.
 .IP 
 .IP o 
 \fBHEX\fP Convert an incoming Shift-JIS character to a 3 byte hex
-representation, ie\&. \f(CW:AB\fP\&.
+representation, i\&.e\&. \f(CW:AB\fP\&.
 .IP 
 .IP o 
 \fBCAP\fP Convert an incoming Shift-JIS character to the 3 byte hex
-representation used by the Columbia Appletalk Program (CAP),
-ie\&. \f(CW:AB\fP\&.  This is used for compatibility between Samba and CAP\&.
+representation used by the Columbia AppleTalk Program (CAP),
+i\&.e\&. \f(CW:AB\fP\&.  This is used for compatibility between Samba and CAP\&.
 .IP 
 .IP 
 .IP "\fBcomment (S)\fP" 
@@ -1704,7 +1704,7 @@ in the configuration file than the service doing the copying\&.
 .IP 
 A synonym for this parameter is \fB\'create mode\'\fP\&.
 .IP 
-When a file is created, the neccessary permissions are calculated
+When a file is created, the necessary permissions are calculated
 according to the mapping from DOS modes to UNIX permissions, and the
 resulting UNIX mode is then bit-wise \'AND\'ed with this parameter\&.
 This parameter may be thought of as a bit-wise MASK for the UNIX modes
@@ -1859,7 +1859,7 @@ If this option is set to True, then Samba will attempt to recursively
 delete any files and directories within the vetoed directory\&. This can
 be useful for integration with file serving systems such as \fBNetAtalk\fP,
 which create meta-files within directories you might normally veto
-DOS/Windows users from seeing (eg\&. \f(CW\&.AppleDouble\fP)
+DOS/Windows users from seeing (e\&.g\&. \f(CW\&.AppleDouble\fP)
 .IP 
 Setting \f(CW\'delete veto files = True\'\fP allows these directories to be 
 transparently deleted when the parent directory is deleted (so long
@@ -1908,7 +1908,7 @@ return value can give the block size in bytes\&. The default blocksize
 is 1024 bytes\&.
 .IP 
 Note: Your script should \fINOT\fP be setuid or setgid and should be
-owned by (and writable only by) root!
+owned by (and writeable only by) root!
 .IP 
 \fBDefault:\fP
 \f(CW	By default internal routines for determining the disk capacity
@@ -1955,7 +1955,7 @@ Synonym for \fBpath\fP\&.
 This parameter is the octal modes which are used when converting DOS
 modes to UNIX modes when creating UNIX directories\&.
 .IP 
-When a directory is created, the neccessary permissions are calculated
+When a directory is created, the necessary permissions are calculated
 according to the mapping from DOS modes to UNIX permissions, and the
 resulting UNIX mode is then bit-wise \'AND\'ed with this parameter\&.
 This parameter may be thought of as a bit-wise MASK for the UNIX modes
@@ -1968,7 +1968,7 @@ directory to modify it\&.
 .IP 
 Following this Samba will bit-wise \'OR\' the UNIX mode created from
 this parameter with the value of the "force directory mode"
-parameter\&. This parameter is set to 000 by default (ie\&. no extra mode
+parameter\&. This parameter is set to 000 by default (i\&.e\&. no extra mode
 bits are added)\&.
 .IP 
 See the \fB"force directory mode"\fP parameter
@@ -2012,7 +2012,7 @@ See also the parameter \fBwins support\fP\&.
 This is an \fBEXPERIMENTAL\fP parameter that is part of the unfinished
 Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
-Samba NT Domain Controller functionality please subscibe to the
+Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
 \fIlistproc@samba\&.anu\&.edu\&.au\fP
 .IP 
@@ -2021,7 +2021,7 @@ mailing list \fBSamba-ntdom\fP available by sending email to
 This is an \fBEXPERIMENTAL\fP parameter that is part of the unfinished
 Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
-Samba NT Domain Controller functionality please subscibe to the
+Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
 \fIlistproc@samba\&.anu\&.edu\&.au\fP
 .IP 
@@ -2036,7 +2036,7 @@ files\&. It is left behind for compatibility reasons\&.
 This is an \fBEXPERIMENTAL\fP parameter that is part of the unfinished
 Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
-Samba NT Domain Controller functionality please subscibe to the
+Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
 \fIlistproc@samba\&.anu\&.edu\&.au\fP
 .IP 
@@ -2045,7 +2045,7 @@ mailing list \fBSamba-ntdom\fP available by sending email to
 This is an \fBEXPERIMENTAL\fP parameter that is part of the unfinished
 Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
-Samba NT Domain Controller functionality please subscibe to the
+Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
 \fIlistproc@samba\&.anu\&.edu\&.au\fP
 .IP 
@@ -2054,7 +2054,7 @@ mailing list \fBSamba-ntdom\fP available by sending email to
 This is an \fBEXPERIMENTAL\fP parameter that is part of the unfinished
 Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
-Samba NT Domain Controller functionality please subscibe to the
+Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
 \fIlistproc@samba\&.anu\&.edu\&.au\fP
 .IP 
@@ -2067,7 +2067,7 @@ Samba documentation directory \f(CWdocs/\fP shipped with the source code\&.
 .IP 
 Note that Win95/98 Domain logons are \fINOT\fP the same as Windows
 NT Domain logons\&. NT Domain logons require a Primary Domain Controller
-(PDC) for the Domain\&. It is inteded that in a future release Samba
+(PDC) for the Domain\&. It is intended that in a future release Samba
 will be able to provide this functionality for Windows NT clients
 also\&.
 .IP 
@@ -2077,7 +2077,7 @@ also\&.
 .IP "\fBdomain master (G)\fP" 
 .IP 
 Tell \fBnmbd\fP to enable WAN-wide browse list
-collation\&.Setting this option causes \fBnmbd\fP to
+collation\&. Setting this option causes \fBnmbd\fP to
 claim a special domain specific NetBIOS name that identifies it as a
 domain master browser for its given
 \fBworkgroup\fP\&. Local master browsers in the same
@@ -2091,7 +2091,7 @@ list, instead of just the list for their broadcast-isolated subnet\&.
 Note that Windows NT Primary Domain Controllers expect to be able to
 claim this \fBworkgroup\fP specific special NetBIOS
 name that identifies them as domain master browsers for that
-\fBworkgroup\fP by default (ie\&. there is no way to
+\fBworkgroup\fP by default (i\&.e\&. there is no way to
 prevent a Windows NT PDC from attempting to do this)\&. This means that
 if this parameter is set and \fBnmbd\fP claims the
 special name for a \fBworkgroup\fP before a Windows NT
@@ -2103,7 +2103,7 @@ and may fail\&.
 .IP 
 .IP "\fBdont descend (S)\fP" 
 .IP 
-There are certain directories on some systems (eg\&., the \f(CW/proc\fP tree
+There are certain directories on some systems (e\&.g\&., the \f(CW/proc\fP tree
 under Linux) that are either not of interest to clients or are
 infinitely deep (recursive)\&. This parameter allows you to specify a
 comma-delimited list of directories that the server should always show
@@ -2121,7 +2121,7 @@ just \f(CW"/proc"\fP\&. Experimentation is the best policy :-)
 .IP 
 .IP "\fBdos filetime resolution (S)\fP" 
 .IP 
-Under the DOS and Windows FAT filesystem, the finest granulatity on
+Under the DOS and Windows FAT filesystem, the finest granularity on
 time resolution is two seconds\&. Setting this parameter for a share
 causes Samba to round the reported time down to the nearest two second
 boundary when a query call that requires one second resolution is made
@@ -2151,7 +2151,7 @@ the timestamp on it\&. Under POSIX semantics, only the owner of the file
 or root may change the timestamp\&. By default, Samba runs with POSIX
 semantics and refuses to change the timestamp on a file if the user
 smbd is acting on behalf of is not the file owner\&. Setting this option
-to True allows DOS semantics and smbd will change the file timstamp as
+to True allows DOS semantics and smbd will change the file timestamp as
 DOS requires\&.
 .IP 
 \fBDefault:\fP
@@ -2247,10 +2247,10 @@ This parameter allows the Samba administrator to stop
 particular share\&. Setting this parameter to \fI"No"\fP prevents any file
 or directory that is a symbolic link from being followed (the user
 will get an error)\&.  This option is very useful to stop users from
-adding a symbolic link to \f(CW/etc/pasword\fP in their home directory for
+adding a symbolic link to \f(CW/etc/passwd\fP in their home directory for
 instance\&.  However it will slow filename lookups down slightly\&.
 .IP 
-This option is enabled (ie\&. \fBsmbd\fP will follow
+This option is enabled (i\&.e\&. \fBsmbd\fP will follow
 symbolic links) by default\&.
 .IP 
 .IP "\fBforce create mode (S)\fP" 
@@ -2258,7 +2258,7 @@ symbolic links) by default\&.
 This parameter specifies a set of UNIX mode bit permissions that will
 \fI*always*\fP be set on a file created by Samba\&. This is done by
 bitwise \'OR\'ing these bits onto the mode bits of a file that is being
-created\&. The default for this parameter is (in octel) 000\&. The modes
+created\&. The default for this parameter is (in octal) 000\&. The modes
 in this parameter are bitwise \'OR\'ed onto the file mode after the mask
 set in the \fB"create mask"\fP parameter is applied\&.
 .IP 
@@ -2280,7 +2280,7 @@ the \'user\'\&.
 This parameter specifies a set of UNIX mode bit permissions that will
 \fI*always*\fP be set on a directory created by Samba\&. This is done by
 bitwise \'OR\'ing these bits onto the mode bits of a directory that is
-being created\&. The default for this parameter is (in octel) 0000 which
+being created\&. The default for this parameter is (in octal) 0000 which
 will not add any extra permission bits to a created directory\&. This
 operation is done after the mode mask in the parameter
 \fB"directory mask"\fP is applied\&.
@@ -2351,7 +2351,7 @@ Windows NT but this can be changed to other strings such as "Samba" or
 .IP 
 .IP "\fBgetwd cache (G)\fP" 
 .IP 
-This is a tuning option\&. When this is enabled a cacheing algorithm
+This is a tuning option\&. When this is enabled a caching algorithm
 will be used to reduce the time taken for getwd() calls\&. This can have
 a significant impact on performance, especially when the
 \fBwidelinks\fP parameter is set to False\&.
@@ -2440,8 +2440,8 @@ Each entry in the list must be separated by a \f(CW\'/\'\fP, which allows
 spaces to be included in the entry\&.  \f(CW\'*\'\fP and \f(CW\'?\'\fP can be used
 to specify multiple files or directories as in DOS wildcards\&.
 .IP 
-Each entry must be a unix path, not a DOS path and must not include the 
-unix directory separator \f(CW\'/\'\fP\&.
+Each entry must be a Unix path, not a DOS path and must not include the 
+Unix directory separator \f(CW\'/\'\fP\&.
 .IP 
 Note that the case sensitivity option is applicable in hiding files\&.
 .IP 
@@ -2623,7 +2623,7 @@ parameter allows the use of them to be turned on or off\&.
 Kernel oplocks support allows Samba \fBoplocks\fP to be
 broken whenever a local UNIX process or NFS operation accesses a file
 that \fBsmbd\fP has oplocked\&. This allows complete
-data consistancy between SMB/CIFS, NFS and local file access (and is a
+data consistency between SMB/CIFS, NFS and local file access (and is a
 \fIvery\fP cool feature :-)\&.
 .IP 
 This parameter defaults to \fI"On"\fP on systems that have the support,
@@ -2769,7 +2769,7 @@ will be loaded for browsing by default\&. See the
 \fBDefault:\fP
 \f(CW	load printers = yes\fP
 .IP 
-bg(Example:)
+\fBExample:\fP
 \f(CW	load printers = no\fP
 .IP 
 .IP "\fBlocal master (G)\fP" 
@@ -2895,15 +2895,15 @@ client\&.  The share must be writeable when the logs in for the first
 time, in order that the Windows 95/98 client can create the user\&.dat
 and other directories\&.
 .IP 
-Thereafter, the directories and any of contents can, if required, be
-made read-only\&.  It is not adviseable that the USER\&.DAT file be made
+Thereafter, the directories and any of the contents can, if required, be
+made read-only\&.  It is not advisable that the USER\&.DAT file be made
 read-only - rename it to USER\&.MAN to achieve the desired effect (a
 \fIMAN\fPdatory profile)\&.
 .IP 
 Windows clients can sometimes maintain a connection to the [homes]
 share, even though there is no user logged in\&.  Therefore, it is vital
 that the logon path does not include a reference to the homes share
-(i\&.e setting this parameter to \f(CW\e\e%N\eHOMES\eprofile_path\fP will cause
+(i\&.e\&. setting this parameter to \f(CW\e\e%N\eHOMES\eprofile_path\fP will cause
 problems)\&.
 .IP 
 This option takes the standard substitutions, allowing you to have
@@ -2934,7 +2934,7 @@ file that will be downloaded is:
 .IP 
 The contents of the batch file is entirely your choice\&.  A suggested
 command would be to add \f(CWNET TIME \e\eSERVER /SET /YES\fP, to force every
-machine to synchronise clocks with the same time server\&.  Another use
+machine to synchronize clocks with the same time server\&.  Another use
 would be to add \f(CWNET USE U: \e\eSERVER\eUTILS\fP for commonly used
 utilities, or \f(CWNET USE Q: \e\eSERVER\eISO9001_QA\fP for example\&.
 .IP 
@@ -3006,7 +3006,7 @@ previous identical \fBlpq\fP command will be used if the cached data is
 less than 10 seconds old\&. A large value may be advisable if your
 \fBlpq\fP command is very slow\&.
 .IP 
-A value of 0 will disable cacheing completely\&.
+A value of 0 will disable caching completely\&.
 .IP 
 See also the \fB"printing"\fP parameter\&.
 .IP 
@@ -3178,8 +3178,8 @@ See the section on \fB"NAME MANGLING"\fP\&.
 .IP 
 .IP "\fBmangled map (S)\fP" 
 .IP 
-This is for those who want to directly map UNIX file names which are
-not representable on Windows/DOS\&.  The mangling of names is not always
+This is for those who want to directly map UNIX file names which can
+not be represented on Windows/DOS\&.  The mangling of names is not always
 what is needed\&.  In particular you may have documents with file
 extensions that differ between DOS and UNIX\&. For example, under UNIX
 it is common to use \f(CW"\&.html"\fP for HTML files, whereas under
@@ -3190,7 +3190,7 @@ So to map \f(CW"html"\fP to \f(CW"htm"\fP you would use:
 \f(CW  mangled map = (*\&.html *\&.htm)\fP
 .IP 
 One very useful case is to remove the annoying \f(CW";1"\fP off the ends
-of filenames on some CDROMS (only visible under some UNIXes)\&. To do
+of filenames on some CDROMS (only visible under some UNIXs)\&. To do
 this use a map of (*;1 *)\&.
 .IP 
 \fBdefault:\fP
@@ -3309,7 +3309,7 @@ source code, documents, etc\&.\&.\&.
 .IP 
 Note that this requires the \fB"create mask"\fP
 parameter to be set such that owner execute bit is not masked out
-(ie\&. it must include 100)\&. See the parameter \fB"create
+(i\&.e\&. it must include 100)\&. See the parameter \fB"create
 mask"\fP for details\&.
 .IP 
 \fBDefault:\fP
@@ -3324,7 +3324,7 @@ This controls whether DOS style hidden files should be mapped to the
 UNIX world execute bit\&.
 .IP 
 Note that this requires the \fB"create mask"\fP to be
-set such that the world execute bit is not masked out (ie\&. it must
+set such that the world execute bit is not masked out (i\&.e\&. it must
 include 001)\&. See the parameter \fB"create mask"\fP
 for details\&.
 .IP 
@@ -3340,7 +3340,7 @@ This controls whether DOS style system files should be mapped to the
 UNIX group execute bit\&.
 .IP 
 Note that this requires the \fB"create mask"\fP to be
-set such that the group execute bit is not masked out (ie\&. it must
+set such that the group execute bit is not masked out (i\&.e\&. it must
 include 010)\&. See the parameter \fB"create mask"\fP
 for details\&.
 .IP 
@@ -3353,7 +3353,7 @@ for details\&.
 .IP "\fBmap to guest (G)\fP" 
 .IP 
 This parameter is only useful in \fBsecurity\fP modes
-other than \fB"security=share"\fP - ie\&. user,
+other than \fB"security=share"\fP - i\&.e\&. user,
 server, and domain\&.
 .IP 
 This parameter can take three different values, which tell
@@ -3377,7 +3377,7 @@ account"\fP\&.
 \fB"Bad Password"\fP - Means user logins with an invalid
 password are treated as a guest login and mapped into the
 \fB"guest account"\fP\&. Note that this can
-cause problems as it means that any user mistyping their
+cause problems as it means that any user incorrectly typing their
 password will be silently logged on a \fB"guest"\fP - and 
 will not know the reason they cannot access files they think
 they should - there will have been no message given to them
@@ -3473,7 +3473,7 @@ never need to set this parameter\&.
 This parameter limits the maximum number of open files that one
 \fBsmbd\fP file serving process may have open for
 a client at any one time\&. The default for this parameter is set
-very high (10,000) as Samba uses only one bit per un-opened file\&.
+very high (10,000) as Samba uses only one bit per unopened file\&.
 .IP 
 The limit of the number of open files is usually set by the
 UNIX per-process file descriptor limit rather than this parameter
@@ -3726,7 +3726,7 @@ system and the Samba server with this option must also be a
 .IP 
 .IP "\fBnt pipe support (G)\fP" 
 .IP 
-This boolean parameter controlls whether \fBsmbd\fP
+This boolean parameter controls whether \fBsmbd\fP
 will allow Windows NT clients to connect to the NT SMB specific
 \f(CWIPC$\fP pipes\&. This is a developer debugging option and can be left
 alone\&.
@@ -3736,7 +3736,7 @@ alone\&.
 .IP 
 .IP "\fBnt smb support (G)\fP" 
 .IP 
-This boolean parameter controlls whether \fBsmbd\fP
+This boolean parameter controls whether \fBsmbd\fP
 will negotiate NT specific SMB support with Windows NT
 clients\&. Although this is a developer debugging option and should be
 left alone, benchmarking has discovered that Windows NT clients give
@@ -3808,15 +3808,15 @@ See also the \fBuser\fP parameter\&.
 .IP 
 This boolean option tells smbd whether to issue oplocks (opportunistic
 locks) to file open requests on this share\&. The oplock code can
-dramatically (approx 30% or more) improve the speed of access to files
-on Samba servers\&. It allows the clients to agressively cache files
+dramatically (approx\&. 30% or more) improve the speed of access to files
+on Samba servers\&. It allows the clients to aggressively cache files
 locally and you may want to disable this option for unreliable network
 environments (it is turned on by default in Windows NT Servers)\&.  For
 more information see the file Speed\&.txt in the Samba docs/ directory\&.
 .IP 
 Oplocks may be selectively turned off on certain files on a per share basis\&.
-See the \'veto oplock files\' parameter\&. On some systems oplocks are recognised
-by the underlying operating system\&. This allows data synchronisation between
+See the \'veto oplock files\' parameter\&. On some systems oplocks are recognized
+by the underlying operating system\&. This allows data synchronization between
 all access to oplocked files, whether it be via Samba or NFS or a local
 UNIX process\&. See the \fBkernel oplocks\fP parameter
 for details\&.
@@ -3854,7 +3854,7 @@ old \fBsmb\&.conf\fP files\&.
 This is a Samba developer option that allows a system command to be
 called when either \fBsmbd\fP or
 \fBnmbd\fP crashes\&. This is usually used to draw
-attention to the fact that a problem occured\&.
+attention to the fact that a problem occurred\&.
 .IP 
 \fBDefault:\fP
 \f(CW	panic action = <empty string>\fP
@@ -3941,7 +3941,7 @@ program"\fP\&.
 .IP 
 The name of a program that can be used to set UNIX user passwords\&.
 Any occurrences of \fB%u\fP will be replaced with the
-user name\&. The user name is checked for existance before calling the
+user name\&. The user name is checked for existence before calling the
 password changing program\&.
 .IP 
 Also note that many passwd programs insist in \fI"reasonable"\fP
@@ -3952,7 +3952,7 @@ Windows for Workgroups) uppercase the password before sending it\&.
 \fINote\fP that if the \fB"unix password sync"\fP
 parameter is set to \f(CW"True"\fP then this program is called \fI*AS
 ROOT*\fP before the SMB password in the
-\fBsmbpassswd\fP file is changed\&. If this UNIX
+\fBsmbpasswd\fP file is changed\&. If this UNIX
 password change fails, then \fBsmbd\fP will fail to
 change the SMB password also (this is by design)\&.
 .IP 
@@ -4045,8 +4045,8 @@ better restrict them with hosts allow!
 If the \fB"security"\fP parameter is set to
 \fB"domain"\fP, then the list of machines in this option must be a list
 of Primary or Backup Domain controllers for the
-\fBDomain\fP, as the Samba server is cryptographically
-in that domain, and will use crpytographically authenticated RPC calls
+\fBDomain\fP, as the Samba server is cryptographicly
+in that domain, and will use cryptographicly authenticated RPC calls
 to authenticate the user logging on\&. The advantage of using
 \fB"security=domain"\fP is that if you list
 several hosts in the \fB"password server"\fP option then
@@ -4093,7 +4093,7 @@ where print data will spool prior to being submitted to the host for
 printing\&.
 .IP 
 For a printable service offering guest access, the service should be
-readonly and the path should be world-writable and have the sticky bit
+readonly and the path should be world-writeable and have the sticky bit
 set\&. This is not mandatory of course, but you probably won\'t get the
 results you expect if you do otherwise\&.
 .IP 
@@ -4255,12 +4255,12 @@ If there is neither a specified print command for a printable service
 nor a global print command, spool files will be created but not
 processed and (most importantly) not removed\&.
 .IP 
-Note that printing may fail on some UNIXes from the \f(CW"nobody"\fP
+Note that printing may fail on some UNIXs from the \f(CW"nobody"\fP
 account\&. If this happens then create an alternative guest account that
 can print and set the \fB"guest account"\fP in the
 \fB"[global]"\fP section\&.
 .IP 
-You can form quite complex print commands by realising that they are
+You can form quite complex print commands by realizing that they are
 just passed to a shell\&. For example the following will log a print
 job, print the file, then remove it\&. Note that \f(CW\';\'\fP is the usual
 separator for command in shell scripts\&.
@@ -4525,7 +4525,7 @@ command as the PATH may not be available to the server\&.
 .IP 
 This parameter specifies the command to be executed on the server host
 in order to resume the printerqueue\&. It is the command to undo the
-behaviour that is caused by the previous parameter
+behavior that is caused by the previous parameter
 (\fB"queuepause command\fP)\&.
 .IP 
 This command should be a program or script which takes a printer name
@@ -4576,9 +4576,9 @@ the \fB"invalid users"\fP parameter\&.
 .IP "\fBread only (S)\fP" 
 .IP 
 Note that this is an inverted synonym for
-\fB"writable"\fP and \fB"write ok"\fP\&.
+\fB"writeable"\fP and \fB"write ok"\fP\&.
 .IP 
-See also \fB"writable"\fP and \fB"write
+See also \fB"writeable"\fP and \fB"write
 ok"\fP\&.
 .IP 
 .IP "\fBread prediction (G)\fP" 
@@ -4674,7 +4674,7 @@ See the documentation file BROWSING\&.txt in the docs/ directory\&.
 .IP "\fBremote browse sync (G)\fP" 
 .IP 
 This option allows you to setup \fBnmbd\fP to
-periodically request synchronisation of browse lists with the master
+periodically request synchronization of browse lists with the master
 browser of a samba server that is on a remote segment\&. This option
 will allow you to gain browse lists for multiple workgroups across
 routed networks\&. This is done in a manner that does not work with any
@@ -4690,7 +4690,7 @@ For example:
 \f(CW	remote browse sync = 192\&.168\&.2\&.255 192\&.168\&.4\&.255\fP
 .IP 
 the above line would cause \fBnmbd\fP to request the
-master browser on the specified subnets or addresses to synchronise
+master browser on the specified subnets or addresses to synchronize
 their browse lists with the local server\&.
 .IP 
 The IP addresses you choose would normally be the broadcast addresses
@@ -4737,7 +4737,7 @@ Synonym for \fB"root directory"\fP\&.
 .IP 
 .IP "\fBroot directory (G)\fP" 
 .IP 
-The server will \f(CW"chroot()"\fP (ie\&. Change it\'s root directory) to
+The server will \f(CW"chroot()"\fP (i\&.e\&. Change it\'s root directory) to
 this directory on startup\&. This is not strictly necessary for secure
 operation\&. Even without it the server will deny access to files not in
 one of the service entries\&. It may also check for, and deny access to,
@@ -4774,7 +4774,7 @@ See also \fB"postexec"\fP\&.
 .IP 
 This is the same as the \fB"preexec"\fP parameter except
 that the command is run as root\&. This is useful for mounting
-filesystems (such as cdroms) before a connection is finalised\&.
+filesystems (such as cdroms) before a connection is finalized\&.
 .IP 
 See also \fB"preexec"\fP\&.
 .IP 
@@ -4803,7 +4803,7 @@ In previous versions of Samba the default was
 \fB"security=share"\fP mainly because that was
 the only option at one stage\&.
 .IP 
-There is a bug in WfWg that has relevence to this setting\&. When in
+There is a bug in WfWg that has relevance to this setting\&. When in
 user or server level security a WfWg client will totally ignore the
 password you type in the "connect drive" dialog box\&. This makes it
 very difficult (if not impossible) to connect to a Samba service as
@@ -4821,7 +4821,7 @@ difficult to setup guest shares with
 \fBsecurity=user\fP, see the \fB"map to
 guest"\fPparameter for details\&.
 .IP 
-It is possible to use \fBsmbd\fP in a \fI"hybred
+It is possible to use \fBsmbd\fP in a \fI"hybrid
 mode"\fP where it is offers both user and share level security under
 different \fBNetBIOS aliases\fP\&. See the
 \fBNetBIOS aliases\fP and the
@@ -4909,7 +4909,7 @@ are then applied and may change the UNIX user to use on this
 connection, but only after the user has been successfully
 authenticated\&.
 .IP 
-\fINote\fP that the the name of the resource being requested is
+\fINote\fP that the name of the resource being requested is
 \fI*not*\fP sent to the server until after the server has successfully
 authenticated the client\&. This is why guest shares don\'t work in user
 level security without allowing the server to automatically map unknown
@@ -4935,7 +4935,7 @@ the same as \fB"security=user"\fP\&. It only
 affects how the server deals with the authentication, it does not in
 any way affect what the client sees\&.
 .IP 
-\fINote\fP that the the name of the resource being requested is
+\fINote\fP that the name of the resource being requested is
 \fI*not*\fP sent to the server until after the server has successfully
 authenticated the client\&. This is why guest shares don\'t work in server
 level security without allowing the server to automatically map unknown
@@ -4968,7 +4968,7 @@ the same as \fB"security=user"\fP\&. It only
 affects how the server deals with the authentication, it does not in
 any way affect what the client sees\&.
 .IP 
-\fINote\fP that the the name of the resource being requested is
+\fINote\fP that the name of the resource being requested is
 \fI*not*\fP sent to the server until after the server has successfully
 authenticated the client\&. This is why guest shares don\'t work in domain
 level security without allowing the server to automatically map unknown
@@ -4981,7 +4981,7 @@ e,(BUG:) There is currently a bug in the implementation of
 set usernames\&. The communication with a Domain Controller
 must be done in UNICODE and Samba currently does not widen
 multi-byte user names to UNICODE correctly, thus a multi-byte
-username will not be recognised correctly at the Domain Controller\&.
+username will not be recognized correctly at the Domain Controller\&.
 This issue will be addressed in a future release\&.
 .IP 
 See also the section \fB"NOTE ABOUT USERNAME/PASSWORD
@@ -5032,7 +5032,7 @@ client\&. See the Pathworks documentation for details\&.
 .IP 
 .IP "\fBshare modes (S)\fP" 
 .IP 
-This enables or disables the honouring of the \f(CW"share modes"\fP during a
+This enables or disables the honoring of the \f(CW"share modes"\fP during a
 file open\&. These modes are used by clients to gain exclusive read or
 write access to a file\&.
 .IP 
@@ -5136,9 +5136,9 @@ appropriate documentation for your operating system first (perhaps
 \fB"man setsockopt"\fP will help)\&.
 .IP 
 You may find that on some systems Samba will say "Unknown socket
-option" when you supply an option\&. This means you either mis-typed it
-or you need to add an include file to includes\&.h for your OS\&. If the
-latter is the case please send the patch to
+option" when you supply an option\&. This means you either incorrectly 
+typed it or you need to add an include file to includes\&.h for your OS\&. 
+If the latter is the case please send the patch to
 \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
 .IP 
 Any of the supported socket options may be combined in any way you
@@ -5237,7 +5237,7 @@ option \f(CW"--with-ssl"\fP was given at configure time\&.
 enabled by default in any current binary version of Samba\&.
 .IP 
 This variable defines where to look up the Certification
-Autorities\&. The given directory should contain one file for each CA
+Authorities\&. The given directory should contain one file for each CA
 that samba will trust\&.  The file name must be the hash value over the
 "Distinguished Name" of the CA\&. How this directory is set up is
 explained later in this document\&. All files within the directory that
@@ -5260,7 +5260,7 @@ This variable is a second way to define the trusted CAs\&. The
 certificates of the trusted CAs are collected in one big file and this
 variable points to the file\&. You will probably only use one of the two
 ways to define your CAs\&. The first choice is preferable if you have
-many CAs or want to be flexible, the second is perferable if you only
+many CAs or want to be flexible, the second is preferable if you only
 have one CA and want to keep things simple (you won\'t need to create
 the hashed file names)\&. You don\'t need this variable if you don\'t
 verify client certificates\&.
@@ -5485,7 +5485,7 @@ change this parameter\&.
 \fBDefault:\fP
 status = yes
 .IP 
-dir(\fBstrict locking (S)\fP)
+.IP "\fBstrict locking (S)\fP" 
 .IP 
 This is a boolean that controls the handling of file locking in the
 server\&. When this is set to \f(CW"yes"\fP the server will check every read and
@@ -5511,7 +5511,7 @@ Many Windows applications (including the Windows 98 explorer shell)
 seem to confuse flushing buffer contents to disk with doing a sync to
 disk\&. Under UNIX, a sync call forces the process to be suspended until
 the kernel has ensured that all outstanding data in kernel disk
-buffers has been safely stored onto stable storate\&. This is very slow
+buffers has been safely stored onto stable storage\&. This is very slow
 and should only be done rarely\&. Setting this parameter to "no" (the
 default) means that smbd ignores the Windows applications requests for
 a sync call\&. There is only a possibility of losing data if the
@@ -5556,7 +5556,7 @@ See also the \fB"strict sync"\fP parameter\&.
 \fBDefault:\fP
 \f(CW	sync always = no\fP
 .IP 
-\fBxample:\fP
+\fBExample:\fP
 \f(CW	sync always = yes\fP
 .IP 
 .IP "\fBsyslog (G)\fP" 
@@ -5564,9 +5564,9 @@ See also the \fB"strict sync"\fP parameter\&.
 This parameter maps how Samba debug messages are logged onto the
 system syslog logging levels\&. Samba debug level zero maps onto syslog
 LOG_ERR, debug level one maps onto LOG_WARNING, debug level two maps
-to LOG_NOTICE, debug level three maps onto LOG_INFO\&.  The paramter
+to LOG_NOTICE, debug level three maps onto LOG_INFO\&.  The parameter
 sets the threshold for doing the mapping, all Samba debug messages
-above this threashold are mapped to syslog LOG_DEBUG messages\&.
+above this threshold are mapped to syslog LOG_DEBUG messages\&.
 .IP 
 \fBDefault:\fP
 \f(CW	syslog = 1\fP
@@ -5617,7 +5617,7 @@ parameter allows the timestamping to be turned off\&.
 .IP 
 .IP "\fBunix password sync (G)\fP" 
 .IP 
-This boolean parameter controlls whether Samba attempts to synchronise
+This boolean parameter controls whether Samba attempts to synchronize
 the UNIX password with the SMB password when the encrypted SMB
 password in the smbpasswd file is changed\&. If this is set to true the
 program specified in the \fB"passwd program"\fP
@@ -5777,7 +5777,7 @@ tries all lowercase, followed by the username with the first letter
 capitalized, and fails if the username is not found on the UNIX
 machine\&.
 .IP 
-If this parameter is set to non-zero the behaviour changes\&. This
+If this parameter is set to non-zero the behavior changes\&. This
 parameter is a number that specifies the number of uppercase
 combinations to try whilst trying to determine the UNIX user name\&. The
 higher the number the more combinations will be tried, but the slower
@@ -5792,7 +5792,7 @@ strange usernames on your UNIX machine, such as \f(CW"AstrangeUser"\fP\&.
 .IP 
 .IP "\fBusername map (G)\fP" 
 .IP 
-This option allows you to to specify a file containing a mapping of
+This option allows you to specify a file containing a mapping of
 usernames from the clients to the server\&. This can be used for several
 purposes\&. The most common is to map usernames that users use on DOS or
 Windows machines to those that the UNIX box uses\&. The other is to map
@@ -5927,7 +5927,7 @@ See also the \fB"client code page"\fP parameter\&.
  
 
 	Samba defaults to using a reasonable set of valid characters
-	for english systems
+	for English systems
 
 .DE 
  
@@ -5936,7 +5936,7 @@ See also the \fB"client code page"\fP parameter\&.
 \fBExample\fP
 \f(CW	valid chars = 0345:0305 0366:0326 0344:0304\fP
 .IP 
-The above example allows filenames to have the swedish characters in
+The above example allows filenames to have the Swedish characters in
 them\&.
 .IP 
 NOTE: It is actually quite difficult to correctly produce a \fB"valid
@@ -6124,42 +6124,19 @@ network\&.
 .IP "\fBworkgroup (G)\fP" 
 .IP 
 This controls what workgroup your server will appear to be in when
-queried by clients\&. Note that this parameter also controlls the Domain
+queried by clients\&. Note that this parameter also controls the Domain
 name used with the \fB"security=domain"\fP
 setting\&.
 .IP 
 \fBDefault:\fP
 \f(CW 	set at compile time to WORKGROUP\fP
 .IP 
-\&.B Example:
+\fBExample:\fP
 workgroup = MYGROUP
 .IP 
 .IP "\fBwritable (S)\fP" 
 .IP 
-An inverted synonym is \fB"read only"\fP\&.
-.IP 
-If this parameter is \f(CW"no"\fP, then users of a service may not create
-or modify files in the service\'s directory\&.
-.IP 
-Note that a printable service \fB("printable = yes")\fP
-will \fI*ALWAYS*\fP allow writing to the directory (user privileges
-permitting), but only via spooling operations\&.
-.IP 
-\fBDefault:\fP
-\f(CW 	writable = no\fP
-.IP 
-\fBExamples:\fP
-
-.DS 
- 
-
- 	read only = no
- 	writable = yes
- 	write ok = yes
-
-.DE 
- 
-
+Synonym for \fB"writeable"\fP for people who can\'t spell :-)\&.
 .IP 
 .IP "\fBwrite list (S)\fP" 
 .IP 
@@ -6182,7 +6159,7 @@ See also the \fB"read list"\fP option\&.
 .IP 
 .IP "\fBwrite ok (S)\fP" 
 .IP 
-Synonym for \fBwritable\fP\&.
+Synonym for \fBwriteable\fP\&.
 .IP 
 .IP "\fBwrite raw (G)\fP" 
 .IP 
@@ -6195,7 +6172,30 @@ need to change this parameter\&.
 .IP 
 .IP "\fBwriteable\fP" 
 .IP 
-Synonym for \fB"writable"\fP for people who can\'t spell :-)\&.
+An inverted synonym is \fB"read only"\fP\&.
+.IP 
+If this parameter is \f(CW"no"\fP, then users of a service may not create
+or modify files in the service\'s directory\&.
+.IP 
+Note that a printable service \fB("printable = yes")\fP
+will \fI*ALWAYS*\fP allow writing to the directory (user privileges
+permitting), but only via spooling operations\&.
+.IP 
+\fBDefault:\fP
+\f(CW 	writeable = no\fP
+.IP 
+\fBExamples:\fP
+
+.DS 
+ 
+
+ 	read only = no
+ 	writeable = yes
+ 	write ok = yes
+
+.DE 
+ 
+
 .IP 
 .SH "WARNINGS" 
 .IP 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 46bc292f4d..6c756ec77d 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -1,4 +1,4 @@
-.TH "smbclient" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbclient " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbclient \- ftp-like client to access SMB/CIFS resources on servers
@@ -108,7 +108,7 @@ subnet\&. To specify a particular broadcast address the \fB-B\fP option
 may be used\&.
 .IP 
 .IP 
-If this parameter is not set then the name resolver order defined
+If this parameter is not set then the name resolve order defined
 in the \fBsmb\&.conf\fP file parameter 
 (\fBname resolve order\fP)
 will be used\&.
@@ -257,7 +257,7 @@ the environment variable \f(CWUSER\fP or \f(CWLOGNAME\fP in that order\&.  If no
 username is supplied and neither environment variable exists the
 username "GUEST" will be used\&.
 .IP 
-If the \f(CWUSER\fP environment variable containts a \'%\' character,
+If the \f(CWUSER\fP environment variable contains a \'%\' character,
 everything after that will be treated as a password\&. This allows you
 to set the environment variable to be \f(CWUSER=username%password\fP so
 that a password is not passed on the command line (where it may be
@@ -321,7 +321,7 @@ Samba source code for the complete list\&.
 .IP 
 .IP "\fB-m max protocol level\fP" 
 With the new code in Samba2\&.0,
-\fBsmbclient\fP allways attempts to connect at the maximum
+\fBsmbclient\fP always attempts to connect at the maximum
 protocols level the server supports\&. This parameter is
 preserved for backwards compatibility, but any string
 following the \fB-m\fP will be ignored\&.
@@ -350,13 +350,13 @@ Extract (restore) a local tar file back to a
 share\&. Unless the \fB-D\fP option is given, the tar files will be
 restored from the top level of the share\&. Must be followed by the name
 of the tar file, device or \f(CW"-"\fP for standard input\&. Mutually exclusive
-with the \fBc\fP flag\&. Restored files have theuir creation times (mtime)
+with the \fBc\fP flag\&. Restored files have their creation times (mtime)
 set to the date saved in the tar file\&. Directories currently do not
 get their creation dates restored properly\&.
 .IP 
 .IP "\fBI\fP" 
 Include files and directories\&. Is the default
-behaviour when filenames are specified above\&. Causes tar files to
+behavior when filenames are specified above\&. Causes tar files to
 be included in an extract or create (and therefore everything else to
 be excluded)\&. See example below\&.  Filename globbing does not work for
 included files for extractions (yet)\&.
@@ -465,13 +465,13 @@ be case sensitive, depending on the command\&.
 You can specify file names which have spaces in them by quoting the
 name with double quotes, for example "a long file name"\&.
 .PP 
-Parameters shown in square brackets (eg\&., "[parameter]") are
+Parameters shown in square brackets (e\&.g\&., "[parameter]") are
 optional\&. If not given, the command will use suitable
-defaults\&. Parameters shown in angle brackets (eg\&., "<parameter>") are
+defaults\&. Parameters shown in angle brackets (e\&.g\&., "<parameter>") are
 required\&.
 .PP 
 Note that all commands operating on the server are actually performed
-by issuing a request to the server\&. Thus the behaviour may vary from
+by issuing a request to the server\&. Thus the behavior may vary from
 server to server, depending on how the server was implemented\&.
 .PP 
 The commands available are given here in alphabetical order\&.
@@ -608,7 +608,8 @@ mode to suit either binary data (such as graphical information) or
 text\&. Subsequent print commands will use the currently set print
 mode\&.
 .IP 
-dir(\fBprompt\fP) Toggle prompting for filenames during
+.IP "\fBprompt\fP" 
+Toggle prompting for filenames during
 operation of the \fBmget\fP and \fBmput\fP
 commands\&.
 .IP 
@@ -623,16 +624,19 @@ the server\&. If specified, name the remote copy "remote file name"\&.
 Note that all transfers in smbclient are binary\&. See also the
 \fBlowercase\fP command\&.
 .IP 
-dir(\fBqueue\fP) Displays the print queue, showing the job
+.IP "\fBqueue\fP" 
+Displays the print queue, showing the job
 id, name, size and current status\&.
 .IP 
 .IP "\fBquit\fP" 
 See the \fBexit\fP command\&.
 .IP 
-dir(\fBrd <directory name>\fP) See the \fBrmdir\fP
+.IP "\fBrd <directory name>\fP" 
+See the \fBrmdir\fP
 command\&.
 .IP 
-dir(\fBrecurse\fP) Toggle directory recursion for the
+.IP "\fBrecurse\fP" 
+Toggle directory recursion for the
 commands \fBmget\fP and \fBmput\fP\&.
 .IP 
 When toggled ON, these commands will process all directories in the
@@ -648,7 +652,8 @@ directory on the source machine that match the mask specified to the
 and any mask specified using the \fBmask\fP command will be
 ignored\&.
 .IP 
-dir(\fBrm <mask>\fP) Remove all files matching mask from
+.IP "\fBrm <mask>\fP" 
+Remove all files matching mask from
 the current working directory on the server\&.
 .IP 
 .IP "\fBrmdir <directory name>\fP" 
@@ -657,7 +662,7 @@ directory (user access privileges permitting) from the server\&.
 .IP 
 .IP "\fBtar <c|x>[IXbgNa]\fP" 
 Performs a tar operation - see
-the \fB-T\fP command line option above\&. Behaviour may be
+the \fB-T\fP command line option above\&. Behavior may be
 affected by the \fBtarmode\fP command (see below)\&. Using
 g (incremental) and N (newer) will affect tarmode settings\&. Note that
 using the "-" option with tar x may not work - use the command line
@@ -668,8 +673,9 @@ Blocksize\&. Must be
 followed by a valid (greater than zero) blocksize\&. Causes tar file to
 be written out in blocksize*TBLOCK (usually 512 byte) blocks\&.
 .IP 
-dir(\fBtarmode <full|inc|reset|noreset>\fP) Changes tar\'s
-behaviour with regard to archive bits\&. In full mode, tar will back up
+.IP "\fBtarmode <full|inc|reset|noreset>\fP" 
+Changes tar\'s
+behavior with regard to archive bits\&. In full mode, tar will back up
 everything regardless of the archive bit setting (this is the default
 mode)\&. In incremental mode, tar will only back up files with the
 archive bit set\&. In reset mode, tar will reset the archive bit on all
@@ -687,7 +693,7 @@ would make myfile read only\&.
 .SH "NOTES" 
 .PP 
 Some servers are fussy about the case of supplied usernames,
-passwords, share names (aka service names) and machine names\&. If you
+passwords, share names (AKA service names) and machine names\&. If you
 fail to connect try giving all parameters in uppercase\&.
 .PP 
 It is often necessary to use the \fB-n\fP option when connecting to some
@@ -720,7 +726,7 @@ should be executable by all\&. The client should \fINOT\fP be setuid or
 setgid!
 .PP 
 The client log files should be put in a directory readable and
-writable only by the user\&.
+writeable only by the user\&.
 .PP 
 To test the client, you will need to know the name of a running
 SMB/CIFS server\&. It is possible to run \fBsmbd (8)\fP
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index c389b8ecd2..e2f68fb0d2 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -1,4 +1,4 @@
-.TH "smbd" "8" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbd " "8" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbd \- server to provide SMB/CIFS services to clients
@@ -11,7 +11,8 @@ smbd \- server to provide SMB/CIFS services to clients
 .PP 
 This program is part of the \fBSamba\fP suite\&.
 .PP 
-\fBsmbd\fP is the server daemon that provides filesharing services to
+\fBsmbd\fP is the server daemon that provides filesharing and printing
+services to
 Windows clients\&. The server provides filespace and printer services to
 clients using the SMB (or CIFS) protocol\&. This is compatible with the
 LanManager protocol, and can service LanManager clients\&.  These
@@ -20,18 +21,20 @@ Windows NT, OS/2, DAVE for Macintosh, and smbfs for Linux\&.
 .PP 
 An extensive description of the services that the server can provide
 is given in the man page for the configuration file controlling the
-attributes of those services (see \fBsmb\&.conf (5)\fP)\&.  This man page
+attributes of those services (see 
+\fBsmb\&.conf (5)\fP\&.  This man page
 will not describe the services, but will concentrate on the
 administrative aspects of running the server\&.
 .PP 
 Please note that there are significant security implications to
-running this server, and the \fBsmb\&.conf (5)\fP manpage should be
+running this server, and the 
+\fBsmb\&.conf (5)\fP manpage should be
 regarded as mandatory reading before proceeding with installation\&.
 .PP 
 A session is created whenever a client requests one\&. Each client gets
 a copy of the server for each session\&. This copy then services all
 connections made by the client during that session\&. When all
-connections from its client are are closed, the copy of the server for
+connections from its client are closed, the copy of the server for
 that client terminates\&.
 .PP 
 The configuration file, and any files that it includes, are
@@ -117,14 +120,12 @@ This parameter is not normally specified except in the above
 situation\&.
 .IP 
 .IP "\fB-s configuration file\fP" 
-The default configuration file name is
-determined at compile time\&.
-.IP 
 The file specified contains the configuration details required by the
 server\&.  The information in this file includes server-specific
 information such as what printcap file to use, as well as descriptions
 of all the services that the server is to provide\&. See \fBsmb\&.conf
 (5)\fP for more information\&.
+The default configuration file name is determined at compile time\&.
 .IP 
 .IP "\fB-i scope\fP" 
 This specifies a NetBIOS scope that the server will use
@@ -148,22 +149,22 @@ out\&. Used for debugging by the developers only\&.
 .PP 
 If the server is to be run by the inetd meta-daemon, this file must
 contain suitable startup information for the meta-daemon\&. See the
-section \fIINSTALLATION\fP below\&.
+section INSTALLATION below\&.
 .PP 
 \fB/etc/rc\fP
 .PP 
-(or whatever initialisation script your system uses)\&.
+(or whatever initialization script your system uses)\&.
 .PP 
 If running the server as a daemon at startup, this file will need to
 contain an appropriate startup sequence for the server\&. See the
-section \fIINSTALLATION\fP below\&.
+section INSTALLATION below\&.
 .PP 
 \fB/etc/services\fP
 .PP 
 If running the server via the meta-daemon inetd, this file must
-contain a mapping of service name (eg\&., netbios-ssn) to service port
-(eg\&., 139) and protocol type (eg\&., tcp)\&. See the section
-\fIINSTALLATION\fP below\&.
+contain a mapping of service name (e\&.g\&., netbios-ssn) to service port
+(e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&. See the section
+INSTALLATION below\&.
 .PP 
 \fB/usr/local/samba/lib/smb\&.conf\fP
 .PP 
@@ -213,11 +214,11 @@ exists in Linux, as testing on other systems has thus far shown them
 to be immune\&.
 .PP 
 The server log files should be put in a directory readable and
-writable only by root, as the log files may contain sensitive
+writeable only by root, as the log files may contain sensitive
 information\&.
 .PP 
 The configuration file should be placed in a directory readable and
-writable only by root, as the configuration file controls security for
+writeable only by root, as the configuration file controls security for
 the services offered by the server\&. The configuration file can be made
 readable by all if desired, but this is not necessary for correct
 operation of the server and is not recommended\&. A sample configuration
@@ -245,8 +246,9 @@ utilities such as the tcpd TCP-wrapper may be used for extra security\&.
 For serious use as file server it is recommended that \fBsmbd\fP be run
 as a daemon\&.
 .PP 
-When you\'ve decided, continue with either \fIRUNNING THE SERVER AS A
-DAEMON\fP or \fIRUNNING THE SERVER ON REQUEST\fP\&.
+When you\'ve decided, continue with either 
+RUNNING THE SERVER AS A DAEMON or 
+RUNNING THE SERVER ON REQUEST\&.
 .PP 
 .SH "RUNNING THE SERVER AS A DAEMON" 
 .PP 
@@ -270,18 +272,18 @@ configuration file location and debug level as desired:
 .PP 
 \f(CW/usr/local/samba/bin/smbd -D -l /var/adm/smblogs/log -s /usr/local/samba/lib/smb\&.conf\fP
 .PP 
-(The above should appear in your initialisation script as a single line\&. 
+(The above should appear in your initialization script as a single line\&. 
 Depending on your terminal characteristics, it may not appear that way in
 this man page\&. If the above appears as more than one line, please treat any 
 newlines or indentation as a single space or TAB character\&.)
 .PP 
 If the options used at compile time are appropriate for your system,
-all parameters except the desired debug level and \fB-D\fP may be
-omitted\&. See the section \fIOPTIONS\fP above\&.
+all parameters except \fB-D\fP may be
+omitted\&. See the section OPTIONS above\&.
 .PP 
 .SH "RUNNING THE SERVER ON REQUEST" 
 .PP 
-If your system uses a meta-daemon such as inetd, you can arrange to
+If your system uses a meta-daemon such as \fBinetd\fP, you can arrange to
 have the smbd server started whenever a process attempts to connect to
 it\&. This requires several changes to the startup files on the host
 machine\&. If you are experimenting as an ordinary user rather than as
@@ -329,10 +331,10 @@ start with, the following two services should be all you need:
 
 
 [homes]
-  writable = yes
+  writeable = yes
 
 [printers]
- writable = no
+ writeable = no
  printable = yes
  path = /tmp
  public = yes
@@ -356,7 +358,8 @@ If your machine\'s name is "fred" and your name is "mary", you should
 now be able to connect to the service \f(CW\e\efred\emary\fP\&.
 .PP 
 To properly test and experiment with the server, we recommend using
-the smbclient program (see \fBsmbclient (1)\fP) and also going through
+the smbclient program (see 
+\fBsmbclient (1)\fP) and also going through
 the steps outlined in the file \fIDIAGNOSIS\&.txt\fP in the \fIdocs/\fP
 directory of your Samba installation\&.
 .PP 
@@ -374,8 +377,8 @@ The number and nature of diagnostics available depends on the debug
 level used by the server\&. If you have problems, set the debug level to
 3 and peruse the log files\&.
 .PP 
-Most messages are reasonably self-explanatory\&. Unfortunately, at time
-of creation of this man page there are too many diagnostics available
+Most messages are reasonably self-explanatory\&. Unfortunately, at the time
+this man page was created, there are too many diagnostics available
 in the source code to warrant describing each and every diagnostic\&. At
 this stage your best bet is still to grep the source code and inspect
 the conditions that gave rise to the diagnostics you are seeing\&.
@@ -387,7 +390,7 @@ configuration file within a short period of time\&.
 .PP 
 To shut down a users smbd process it is recommended that SIGKILL (-9)
 \fINOT\fP be used, except as a last resort, as this may leave the shared
-memory area in an inconsistant state\&. The safe way to terminate an
+memory area in an inconsistent state\&. The safe way to terminate an
 smbd is to send it a SIGTERM (-15) signal and wait for it to die on
 its own\&.
 .PP 
@@ -417,7 +420,7 @@ http://samba\&.anu\&.edu\&.au/cifs/\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba\&.anu\&.edu\&.au)\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
index c980ce635a..e0db6edae3 100644
--- a/docs/manpages/smbmnt.8
+++ b/docs/manpages/smbmnt.8
@@ -1,4 +1,4 @@
-.TH SMBMNT 8 "09 Oct 1998" "smbmnt 2.0.0-alpha11"
+.TH SMBMNT 8 "13 Nov 1998" "smbmnt 2.0.0-beta1"
 .SH NAME
 smbmnt \- mount smb file system
 .SH SYNOPSIS
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index 90cc697a39..b887ae6060 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.8
@@ -1,4 +1,4 @@
-.TH SMBMOUNT 8 "09 Oct 1998" "smbmount 2.0.0-alpha11"
+.TH SMBMOUNT 8 "13 Nov 1998" "smbmount 2.0.0-beta1"
 .SH NAME
 smbmount \- mount smb file system
 .SH SYNOPSIS
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 88e3745711..5d49d34e4a 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -1,4 +1,4 @@
-.TH "smbpasswd" "5" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbpasswd " "5" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbpasswd \- The Samba encrypted password file
@@ -12,7 +12,7 @@ smbpasswd is the \fBSamba\fP encrypted password file\&.
 This file is part of the \fBSamba\fP suite\&.
 .PP 
 smbpasswd is the \fBSamba\fP encrypted password file\&. It contains
-the username, unix user id and the SMB hashed passwords of the
+the username, Unix user id and the SMB hashed passwords of the
 user, as well as account flag information and the time the password
 was last changed\&. This file format has been evolving with Samba
 and has had several different formats in the past\&.
@@ -20,7 +20,7 @@ and has had several different formats in the past\&.
 .SH "FILE FORMAT" 
 .PP 
 The format of the smbpasswd file used by Samba 2\&.0 is very similar to
-the familiar unix \fBpasswd (5)\fP file\&. It is an ASCII file containing
+the familiar Unix \fBpasswd (5)\fP file\&. It is an ASCII file containing
 one line for each user\&. Each field within each line is separated from
 the next by a colon\&. Any entry beginning with # is ignored\&. The
 smbpasswd file contains the following information for each user:
@@ -38,7 +38,9 @@ in the standard UNIX passwd file\&.
 .br 
 .IP 
 This is the UNIX uid\&. It must match the uid field for the same
-user entry in the standard UNIX passwd file\&.
+user entry in the standard UNIX passwd file\&. If this does not
+match then Samba will refuse to recognize this \fBsmbpasswd\fP file entry
+as being valid for a user\&.
 .IP 
 .IP "\fBLanman Password Hash\fP" 
 .br 
@@ -49,7 +51,7 @@ digits\&. The \fILANMAN\fP hash is created by DES encrypting a well known
 string with the users 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 same password this entry will be identical (ie\&.
+two users choose the same password this entry will be identical (i\&.e\&.
 the password is not \fI"salted"\fP as the UNIX password is)\&. If the
 user has a null password this field will contain the characters
 \f(CW"NO PASSWORD"\fP as the start of the hex string\&. If the hex string
@@ -59,7 +61,7 @@ server\&.
 .IP 
 \fIWARNING !!\fP\&. Note that, due to the challenge-response nature of the
 SMB/CIFS authentication protocol, anyone with a knowledge of this
-password hash will be able to impersonate the user of the network\&.
+password hash will be able to impersonate the user on the network\&.
 For this reason these hashes are known as \fI"plain text equivalent"\fP
 and must \fINOT\fP be made available to anyone but the root user\&. To
 protect these passwords the \fBsmbpasswd\fP file is placed in a
@@ -80,12 +82,12 @@ This password hash is considered more secure than the \fBLanman
 Password Hash\fP 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 (ie\&. the password is not \fI"salted"\fP as the
+entry will be identical (i\&.e\&. the password is not \fI"salted"\fP as the
 UNIX password is)\&.
 .IP 
 \fIWARNING !!\fP\&. Note that, due to the challenge-response nature of the
 SMB/CIFS authentication protocol, anyone with a knowledge of this
-password hash will be able to impersonate the user of the network\&.
+password hash will be able to impersonate the user on the network\&.
 For this reason these hashes are known as \fI"plain text equivalent"\fP
 and must \fINOT\fP be made available to anyone but the root user\&. To
 protect these passwords the \fBsmbpasswd\fP file is placed in a
@@ -105,8 +107,8 @@ any of the characters\&.
 .IP 
 .IP 
 .IP o 
-\fB\'U\'\fP This means this is a \fI"User"\fP account, ie\&. an ordinary
-user\&. Only \fBUser\fP and \fBWorskstation Trust\fP accounts are
+\fB\'U\'\fP This means this is a \fI"User"\fP account, i\&.e\&. an ordinary
+user\&. Only \fBUser\fP and \fBWorkstation Trust\fP accounts are
 currently supported in the \fBsmbpasswd\fP file\&.
 .IP 
 .IP o 
@@ -118,7 +120,7 @@ will only allow users to log on with no password if the
 in the \fBsmb\&.conf (5)\fP config file\&.
 .IP 
 .IP o 
-\fB\'D\'\fP This means the account is diabled and no SMB/CIFS logins 
+\fB\'D\'\fP This means the account is disabled and no SMB/CIFS logins 
 will be	allowed for this user\&.
 .IP 
 .IP o 
@@ -196,13 +198,15 @@ algorithm\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba\&.anu\&.edu\&.au)\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
 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) and updated for the Samba2\&.0 release by Jeremy
+Source software, available at
+\fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP) 
+and updated for the Samba2\&.0 release by Jeremy
 Allison, \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index d06ea7d768..22237b4210 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -1,4 +1,4 @@
-.TH "smbpasswd" "8" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbpasswd " "8" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbpasswd \- change a users SMB password
@@ -18,7 +18,7 @@ sessions on any machines that store SMB passwords\&.
 .PP 
 By default (when run with no arguments) it will attempt to change the
 current users SMB password on the local machine\&. This is similar to
-the way the \fBpasswd (1)\fP program works\&. \fBsmbpasswd\fP differs from
+the way the \fBpasswd (1)\fP program works\&. \fBsmbpasswd\fP differs from how
 the \fBpasswd\fP program works however in that it is not \fIsetuid root\fP
 but works in a client-server mode and communicates with a locally
 running \fBsmbd\fP\&. As a consequence in order for this
@@ -34,14 +34,14 @@ typed\&. If you have a blank smb password (specified by the string "NO
 PASSWORD" in the \fBsmbpasswd\fP file) then just
 press the <Enter> key when asked for your old password\&.
 .PP 
-\fBsmbpasswd\fP also can be used by a normal user to change their SMB
+\fBsmbpasswd\fP 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 (\fB-r\fP) and
 \fB-U\fP options below\&.
 .PP 
 When run by root, \fBsmbpasswd\fP allows new users to be added and
 deleted in the \fBsmbpasswd\fP file, as well as
-changes to the attributes of the user in this file to be made\&. When
+allows changes to the attributes of the user in this file to be made\&. When
 run by root, \fBsmbpasswd\fP accesses the local
 \fBsmbpasswd\fP file directly, thus enabling
 changes to be made even if \fBsmbd\fP is not running\&.
@@ -55,8 +55,8 @@ be added to the local \fBsmbpasswd\fP file, with
 the new password typed (type <Enter> for the old password)\&. This
 option is ignored if the username following already exists in the
 \fBsmbpasswd\fP file and it is treated like a
-regular change password command\&. Note that the user to be added \&.B
-must already exist in the system password file (usually /etc/passwd)
+regular change password command\&. Note that the user to be added
+\fBmust\fP already exist in the system password file (usually /etc/passwd)
 else the request to add the user will fail\&.
 .IP 
 This option is only available when running \fBsmbpasswd\fP as
@@ -146,6 +146,10 @@ specified must be the Primary Domain Controller for the domain (Backup
 Domain Controllers only have a read-only copy of the user account
 database and will not allow the password change)\&.
 .IP 
+\fINote\fP 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\&.
+.IP 
 .IP "\fB-R name resolve order\fP" 
 This option allows the user of
 smbclient to determine what name resolution services to use when
@@ -162,12 +166,13 @@ resolved as follows :
 .IP o 
 \fBhost\fP : Do a standard host name to IP address resolution,
 using the system /etc/hosts, 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\fP file)\&.
+resolution is operating system dependent\&. For instance on IRIX or
+Solaris, this may be controlled by the \fI/etc/nsswitch\&.conf\fP file)\&.
 .IP 
 .IP o 
-\fBwins\fP : Query a name with the IP address listed in the \fBwins
-server\fP parameter in the smb\&.conf file\&. If 
+\fBwins\fP : Query a name with the IP address listed in the 
+\fBwins server\fP parameter in the 
+\fBsmb\&.conf file\fP\&. If 
 no WINS server has been specified this method will be ignored\&.
 .IP 
 .IP o 
@@ -178,7 +183,7 @@ methods as it depends on the target host being on a locally connected
 subnet\&.
 .IP 
 .IP 
-If this parameter is not set then the name resolver order defined
+If this parameter is not set then the name resolve order defined
 in the \fBsmb\&.conf\fP file parameter 
 \fBname resolve order\fP
 will be used\&.
@@ -218,7 +223,7 @@ Controller for the Domain (found in the
 the machine account password used to create the secure Domain
 communication\&.  This password is then stored by \fBsmbpasswd\fP in a
 file, read only by root, called \f(CW<Domain>\&.<Machine>\&.mac\fP where
-\f(CW<Domain>\fP is the name of the Domain we are joining and tt<Machine>
+\f(CW<Domain>\fP is the name of the Domain we are joining and \f(CW<Machine>\fP
 is the primary NetBIOS name of the machine we are running on\&.
 .IP 
 Once this operation has been performed the
@@ -246,19 +251,20 @@ This option prints the help string for \fBsmbpasswd\fP,
 selecting the correct one for running as root or as an ordinary user\&.
 .IP 
 .IP "\fB-s\fP" 
-This option causes \fBsmbpasswd\fP to be silent (ie\&. not
+This option causes \fBsmbpasswd\fP to be silent (i\&.e\&. not
 issue prompts) and to read it\'s old and new passwords from standard 
 input, rather than from \f(CW/dev/tty\fP (like the \fBpasswd (1)\fP program
 does)\&. This option is to aid people writing scripts to drive \fBsmbpasswd\fP
 .IP 
-dir(\fBusername\fP) This specifies the username for all of the \fIroot
+.IP "\fBusername\fP" 
+This specifies the username for all of the \fIroot
 only\fP options to operate on\&. Only root can specify this parameter as
 only root has the permission needed to modify attributes directly
 in the local \fBsmbpasswd\fP file\&.
 .IP 
 .SH "NOTES" 
 .IP 
-As \fBsmbpasswd\fP works in client-server mode communicating with a
+Since \fBsmbpasswd\fP works in client-server mode communicating with a
 local \fBsmbd\fP for a non-root user then the \fBsmbd\fP
 daemon must be running for this to work\&. A common problem is to add a
 restriction to the hosts that may access the \fBsmbd\fP running on the
diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1
index 17d4026730..78e2213cc6 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -1,4 +1,4 @@
-.TH "smbrun" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbrun " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbrun \- interface program between smbd and external programs
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 350488d790..eae5f594b3 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -1,4 +1,4 @@
-.TH "smbstatus" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbstatus " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbstatus \- report on current Samba connections
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index f1211b376d..88bc88d08a 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -1,4 +1,4 @@
-.TH "smbtar" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "smbtar " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 smbtar \- shell script for backing up SMB/CIFS shares directly to UNIX tape drives
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
index 2e950b8f19..4f9c6cbedb 100644
--- a/docs/manpages/smbumount.8
+++ b/docs/manpages/smbumount.8
@@ -1,4 +1,4 @@
-.TH SMBUMOUNT 8 "09 Oct 1998" "smbumount 2.0.0-alpha11"
+.TH SMBUMOUNT 8 "13 Nov 1998" "smbumount 2.0.0-beta1"
 .SH NAME
 smbumount \- umount for normal users
 .SH SYNOPSIS
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 36b4de140a..5ab76fa504 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -1,4 +1,4 @@
-.TH "swat" "8" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "swat " "8" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 swat \- swat - Samba Web Administration Tool
@@ -17,8 +17,7 @@ addition, a swat configuration page has help links to all the
 configurable options in the \fBsmb\&.conf\fP file
 allowing an administrator to easily look up the effects of any change\&.
 .PP 
-\fBswat\fP can be run as a stand-alone daemon, from \fBinetd\fP,
-or invoked via CGI from a Web server\&.
+\fBswat\fP is run from \fBinetd\fP
 .PP 
 .SH "OPTIONS" 
 .PP 
@@ -36,14 +35,11 @@ of all the services that the server is to provide\&. See smb\&.conf
 .IP 
 .IP "\fB-a\fP" 
 .IP 
-This option is only used if \fBswat\fP is running as it\'s own mini-web
-server (see the \fBINSTALLATION\fP section below)\&.
+This option disables authentication and puts \fBswat\fP in demo mode\&. In
+that mode anyone will be able to modify the
+\fBsmb\&.conf\fP file\&.
 .IP 
-This option removes the need for authentication needed to modify the
-\fBsmb\&.conf\fP file\&. \fI**THIS IS ONLY MEANT FOR
-DEMOING SWAT AND MUST NOT BE SET IN NORMAL SYSTEMS**\fP as it would
-allow \fI*ANYONE*\fP to modify the \fBsmb\&.conf\fP
-file, thus giving them root access\&.
+Do NOT enable this option on a production server\&.
 .IP 
 .PP 
 .SH "INSTALLATION" 
@@ -64,13 +60,10 @@ would put these in:
  
 
 .PP 
-.SH "RUNNING VIA INETD" 
+.SH "INETD INSTALLATION" 
 .PP 
 You need to edit your \f(CW/etc/inetd\&.conf\fP and \f(CW/etc/services\fP to
-enable \fBSWAT\fP to be launched via inetd\&. Note that \fBswat\fP can also
-be launched via the cgi-bin mechanisms of a web server (such as
-apache) and that is described below in the section \fBRUNNING VIA
-CGI-BIN\fP\&.
+enable \fBSWAT\fP to be launched via inetd\&. 
 .PP 
 In \f(CW/etc/services\fP you need to add a line like this:
 .PP 
@@ -88,81 +81,31 @@ In \f(CW/etc/inetd\&.conf\fP you should add a line like this:
 .PP 
 \f(CWswat    stream  tcp     nowait\&.400  root    /usr/local/samba/bin/swat swat\fP
 .PP 
-If you just want to see a demo of how swat works and don\'t want to be
-able to actually change any Samba config via swat then you may chose
-to change \f(CW"root"\fP to some other user that does not have permission
-to write to \fBsmb\&.conf\fP\&.
-.PP 
 One you have edited \f(CW/etc/services\fP and \f(CW/etc/inetd\&.conf\fP you need
 to send a HUP signal to inetd\&. To do this use \f(CW"kill -1 PID"\fP where
 PID is the process ID of the inetd daemon\&.
 .PP 
-.SH "RUNNING VIA CGI-BIN" 
-.PP 
-To run \fBswat\fP via your web servers cgi-bin capability you need to
-copy the \fBswat\fP binary to your cgi-bin directory\&. Note that you
-should run \fBswat\fP either via \fBinetd\fP or via
-cgi-bin but not both\&.
-.PP 
-Then you need to create a \f(CWswat/\fP directory in your web servers root
-directory and copy the \f(CWimages/*\fP and \f(CWhelp/*\fP files found in the
-\f(CWswat/\fP directory of your Samba source distribution into there so
-that they are visible via the URL \f(CWhttp://your\&.web\&.server/swat/\fP
-.PP 
-Next you need to make sure you modify your web servers authentication
-to require a username/pssword for the URL
-\f(CWhttp://your\&.web\&.server/cgi-bin/swat\fP\&. \fI**Don\'t forget this
-step!**\fP If you do forget it then you will be allowing anyone to edit
-your Samba configuration which would allow them to easily gain root
-access on your machine\&.
-.PP 
-After testing the authentication you need to change the ownership and
-permissions on the \fBswat\fP binary\&. It should be owned by root wth the
-setuid bit set\&. It should be ONLY executable by the user that the web
-server runs as\&. Make sure you do this carefully!
-.PP 
-for example, the following would be correct if the web server ran as
-group \f(CW"nobody"\fP\&.
-.PP 
-\f(CW-rws--x---    1 root     nobody    \fP
-.PP 
-You must also realise that this means that any user who can run
-programs as the \f(CW"nobody"\fP group can run \fBswat\fP and modify your
-Samba config\&. Be sure to think about this!
-.PP 
 .SH "LAUNCHING" 
 .PP 
-To launch \fBswat\fP just run your favourite web browser and point it at
-\f(CWhttp://localhost:901/\fP or \f(CWhttp://localhost/cgi-bin/swat/\fP
-depending on how you installed it\&.
+To launch \fBswat\fP just run your favorite web browser and point it at
+\f(CWhttp://localhost:901/\fP\&.
 .PP 
-Note that you can attach to \fBswat\fP from any IP connected machine but
+\fBNote that you can attach to \fBswat\fP from any IP connected machine but
 connecting from a remote machine leaves your connection open to
 password sniffing as passwords will be sent in the clear over the
-wire\&.
-.PP 
-If installed via \fBinetd\fP then you should be prompted for a
-username/password when you connect\&. You will need to provide the
-username \f(CW"root"\fP and the correct root password\&. More sophisticated
-authentication options are planned for future versions of \fBswat\fP\&.
-.PP 
-If installed via cgi-bin then you should receive whatever
-authentication request you configured in your web server\&.
+wire\&.\fP
 .PP 
 .SH "FILES" 
 .PP 
 \fB/etc/inetd\&.conf\fP
 .PP 
-If the server is to be run by the inetd meta-daemon, this file must
-contain suitable startup information for the meta-daemon\&. See the
-section \fBRUNNING VIA INETD\fP above\&.
+This file must contain suitable startup information for the
+meta-daemon\&. 
 .PP 
 \fB/etc/services\fP
 .PP 
-If running the server via the meta-daemon inetd, this file must
-contain a mapping of service name (eg\&., swat) to service port
-(eg\&., 901) and protocol type (eg\&., tcp)\&. See the section
-\fBRUNNING VIA INETD\fP above\&.
+This file must contain a mapping of service name (e\&.g\&., swat) to
+service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&. 
 .PP 
 \fB/usr/local/samba/lib/smb\&.conf\fP
 .PP 
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 358bb63d96..92ba093ded 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -1,4 +1,4 @@
-.TH "testparm" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "testparm " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
 testparm \- check an smb\&.conf configuration file for internal correctness
@@ -38,7 +38,7 @@ then testparm will examine the \fB"hosts
 allow"\fP and \fB"hosts
 deny"\fP parameters in the
 \fBsmb\&.conf\fP file to determine if the hostname
-with this IP address would be allowed acces to the
+with this IP address would be allowed access to the
 \fBsmbd\fP server\&. If this parameter is supplied, the
 hostIP parameter must also be supplied\&.
 .IP 
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index efe5e96d9c..9be0443344 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -1,7 +1,7 @@
-.TH "testparm" "1" "23 Oct 1998" "Samba" "SAMBA" 
+.TH "testprns " "1" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
-testparm \- check printer name for validity with smbd 
+testprns \- check printer name for validity with smbd 
 .PP 
 .SH "SYNOPSIS" 
 .PP 
@@ -27,7 +27,7 @@ The printer name to validate\&.
 .IP 
 Printer names are taken from the first field in each record in the
 printcap file, single printer names and sets of aliases separated by
-vertical bars ("|") are recognised\&. Note that no validation or
+vertical bars ("|") are recognized\&. Note that no validation or
 checking of the printcap syntax is done beyond that required to
 extract the printer name\&. It may be that the print spooling system is
 more forgiving or less forgiving than \fBtestprns\fP\&. However, if