Apply Vance Lankhaars' cifs2002 documentation patch - mostly grammar and

English typo fixes and updates of documentation
(This used to be commit cf240f14a53d95261c557a881cf67c7d3d316a57)

19 files changed, 138 insertions, 262 deletions

diff --git a/docs/README.Win32-Viruses b/docs/README.Win32-Viruses
index 07f03360cb..4646da83cf 100644
--- a/docs/README.Win32-Viruses
+++ b/docs/README.Win32-Viruses
@@ -1,9 +1,9 @@
-While this article is specific to the recent Nimda worm, 
+While this article is specific to the Nimda worm, 
 the information can be applied to preventing the spread
 of many Win32 viruses.  Thanks to the Samba Users Group of Japan
 (SUGJ) for this article.
 ===============================================================================
-Steps againt Nimba Worm for Samba
+Steps against Nimba Worm for Samba
 
 Author: HASEGAWA Yosuke
 Translator: TAKAHASHI Motonobu <monyo@samba.gr.jp>
@@ -14,11 +14,11 @@ The information in this article applies to
     Windows 95/98/Me/NT/2000
 
 SYMPTOMS
-  This article has described the measure against Nimba Worm for Samba
+  This article describes measures against Nimba Worm for Samba
   server.
 
 DESCRIPTION
-  Nimba Worm is infected through the shared disk on a network besides
+  Nimba Worm is infected through shared disks on a network, as well as through
   Microsoft IIS, Internet Explorer and mailer of Outlook series.
 
   At this time, the worm copies itself by the name *.nws and *.eml on
@@ -36,23 +36,22 @@ DESCRIPTION
   veto files = /*.eml/*.nws/riched20.dll/
 -----
 
-  Setting up "veto files" parameter, the matched files on the Samba
-  server are completely hidden from the clients and become impossible
+  By setting the "veto files" parameter, matched files on the Samba
+  server are completely hidden from the clients and making it impossible
   to access them at all.
 
-  In addition to it, the following setting are also pointed out by the
+  In addition to it, the following setting is also pointed out by the
   samba-jp:09448 thread: when the
-  "readme.txt.{3050F4D8-98B5-11CF-BB82-00AA00BDCE0B}" file exists on
-  a Samba server, it is visible only with "readme.txt" and a dangerous
-  code may be performed when this file is double-clicked.
+  "readme.txt.{3050F4D8-98B5-11CF-BB82-00AA00BDCE0B}" file exists on
+  a Samba server, it is visible only as "readme.txt" and dangerous
+  code may be executed if this file is double-clicked.
 
   Setting the following,
 -----
   veto files = /*.{*}/
 -----
-  no files having CLSID in its file extension can be accessed from any
+  any files having CLSID in its file extension will be inaccessible from any
   clients.
 
 This technical article is created based on the discussion of
 samba-jp:09448 and samba-jp:10900 threads.
-
diff --git a/docs/docbook/docbook.txt b/docs/docbook/docbook.txt
index 019b073b51..84848fd88f 100644
--- a/docs/docbook/docbook.txt
+++ b/docs/docbook/docbook.txt
@@ -40,7 +40,7 @@ The Output
 ----------
 
 The current Samba CVS tree contains the SGML/DocBook source files as well 
-as the following autogenerated formats
+as the following autogenerated formats:
 
   * man pages
   * HTML
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index 91286de98b..d88c489a4a 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -21,7 +21,7 @@
 <!ENTITY url.samba 'http://samba.org'>
 <!ENTITY url.samba-ldap-howto 'http://www.unav.es/cti/ldap-smb-howto.html'>
 <!ENTITY url.samba-tng.home 'http://www.kneschke.de/projekte/samba_tng/'>
-<!ENTITY url.samba.mailinglist.ntdom 'http://lists.samba.org/mailman/roster/samba-ntdom'>
+<!ENTITY url.samba.mailinglist.ntdom 'http://lists.samba.org/mailman/samba-ntdom'>
 <!ENTITY url.samba.cifs 'http://samba.org/cifs/'>
 <!ENTITY url.ntdomains-for-unix 'http://mailhost.cb1.com/~lkcl/ntdom/'>
 <!ENTITY url.samba.specs.old 'ftp://ftp.microsoft.com/developr/drg/CIFS/'>
diff --git a/docs/docbook/manpages/findsmb.1.sgml b/docs/docbook/manpages/findsmb.1.sgml
index d8f436c4a1..7b2371fdb7 100644
--- a/docs/docbook/manpages/findsmb.1.sgml
+++ b/docs/docbook/manpages/findsmb.1.sgml
@@ -45,7 +45,7 @@
 		</command> will probe the subnet of the machine where 
 		<command>findsmb</command> is run. This value is passed 
 		to <command>nmblookup</command> as part of the 
-		<constant>-B</constant> option</para></listitem>
+		<constant>-B</constant> option.</para></listitem>
 		</varlistentry>
 	</variablelist>
 </refsect1>
@@ -73,7 +73,7 @@
 	get proper responses  from Windows 95 and Windows 98 machines, 
 	the command must be run as root. </para>
 
-	<para>For example running <command>findsmb</command> on a machine 
+	<para>For example, running <command>findsmb</command> on a machine 
 	without <command>nmbd</command> running would yield output similar
 	to the following</para>
 
diff --git a/docs/docbook/manpages/make_smbcodepage.1.sgml b/docs/docbook/manpages/make_smbcodepage.1.sgml
index a36f9b968c..774b3d8f8b 100644
--- a/docs/docbook/manpages/make_smbcodepage.1.sgml
+++ b/docs/docbook/manpages/make_smbcodepage.1.sgml
@@ -57,10 +57,10 @@
 		<varlistentry>
 		<term>inputfile</term>
 		<listitem><para>This is the input file to process. In 
-		the <parameter>c</parameter> case this will be a text 
+		the <parameter>c</parameter> case, this will be a text 
 		codepage definition file such as the ones found in the Samba 	
 		<filename>source/codepages</filename> directory. In
-		the <parameter>d</parameter> case this will be the 
+		the <parameter>d</parameter> case, this will be the 
 		binary format codepage definition file normally found in 
 		the <filename>lib/codepages</filename> directory in the 
 		Samba install directory path.</para></listitem>
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index d5c89064e7..2b8e066120 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -67,7 +67,7 @@
 
 	<para>In addition, <command>nmbd</command> can act as a WINS 
 	proxy, relaying broadcast queries from clients that do 
-	not understand how to talk the WINS protocol to a WIN 
+	not understand how to talk the WINS protocol to a WINS 
 	server.</para>
 </refsect1>
 
@@ -99,7 +99,7 @@
 		<listitem><para>If this parameter is specified it causes the
 		server to run "interactively", not as a daemon, even if the
 		server is executed on the command line of a shell. Setting this
-		parameter negates the implicit deamon mode when run from the
+		parameter negates the implicit daemon mode when run from the
 		command line.
 		</para></listitem>
 		</varlistentry>
@@ -136,9 +136,9 @@
 		Samba as part of the build process. Common defaults 
 		are <filename>/usr/local/samba/lib/lmhosts</filename>,
 		<filename>/usr/samba/lib/lmhosts</filename> or
-		<filename>/etc/lmhosts</filename>. See the <ulink url="lmhosts.5.html">
-		<filename>lmhosts(5)</filename></ulink> man page for details on the 
-		contents of this file.</para></listitem>
+		<filename>/etc/lmhosts</filename>. See the
+		<ulink url="lmhosts.5.html"><filename>lmhosts(5)</filename></ulink>
+		man page for details on the contents of this file.</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
@@ -169,15 +169,15 @@
 		<para>Note that specifying this parameter here will override 
 		the <ulink url="smb.conf.5.html#loglevel">log level</ulink> 
 		parameter in the <ulink url="smb.conf.5.html"><filename>
-		smb.conf</filename></ulink> file.</para></listitem>
+		smb.conf(5)</filename></ulink> file.</para></listitem>
 		</varlistentry>
 		
 		<varlistentry>
 		<term>-l &lt;log directory&gt;</term>
 		<listitem><para>The -l parameter specifies a directory 
 		into which the "log.nmbd" log file will be created
-		for operational data from the running
-		<command>nmbd</command> server. The default log directory is compiled into Samba
+		for operational data from the running <command>nmbd</command>
+		server. The default log directory is compiled into Samba
 		as part of the build process. Common defaults are <filename>
 		/usr/local/samba/var/log.nmb</filename>, <filename>
 		/usr/samba/var/log.nmb</filename> or
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index 213275b7cc..45ccbaee64 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -41,11 +41,11 @@
 	Samba</ulink> suite.</para>
 
 	<para>The pdbedit program is used to manage the users accounts
-	stored in the sam database and can be run only by root.</para>
+	stored in the sam database and can only be run by root.</para>
 
-	<para>The pdbedit tool use the passdb modular interface and is
+	<para>The pdbedit tool uses the passdb modular interface and is
 	independent from the kind of users database used (currently there
-	are smbpasswd, ldap, nis+ and tdb based and more can be addedd
+	are smbpasswd, ldap, nis+ and tdb based and more can be added
 	without changing the tool).</para>
 
 	<para>There are five main ways to use pdbedit: adding a user account,
@@ -58,7 +58,7 @@
 	<variablelist>
 		<varlistentry>
 		<term>-l</term>
-		<listitem><para>This option list all the user accounts
+		<listitem><para>This option lists all the user accounts
 		present in the users database.
 		This option prints a list of user/uid pairs separated by
 		the ':' character.</para>
@@ -75,8 +75,8 @@
 		
 		<varlistentry>
 		<term>-v</term>
-		<listitem><para>This option sets the verbose listing format.
-		It will make pdbedit list the users in the database printing
+		<listitem><para>This option enables the verbose listing format.
+		It causes pdbedit to list the users in the database, printing
 		out the account fields in a descriptive format.</para>
 
 		<para>Example: <command>pdbedit -l -v</command></para>
@@ -108,7 +108,7 @@
 		<varlistentry>
 		<term>-w</term>
 		<listitem><para>This option sets the "smbpasswd" listing format.
-		It will make pdbedit list the users in the database printing
+		It will make pdbedit list the users in the database, printing
 		out the account fields in a format compatible with the
 		<filename>smbpasswd</filename> file format. (see the <ulink
 		url="smbpasswd.5.html"><filename>smbpasswd(5)</filename></ulink> for details)</para>
@@ -124,8 +124,8 @@
 		
 		<varlistentry>
 		<term>-u username</term>
-		<listitem><para>This option specifies that the username to be
-		used for the operation requested (listing, adding, removing)
+		<listitem><para>This option specifies the username to be
+		used for the operation requested (listing, adding, removing).
 		It is <emphasis>required</emphasis> in add, remove and modify
 		operations and <emphasis>optional</emphasis> in list
 		operations.</para>
@@ -198,9 +198,9 @@
 		<varlistentry>
 		<term>-a</term>
 		<listitem><para>This option is used to add a user into the
-		database. This command need the user name be specified with
-		the -u switch. When adding a new user pdbedit will also
-		ask for the password to be used</para>
+		database. This command needs a user name specified with
+		the -u switch. When adding a new user, pdbedit will also
+		ask for the password to be used.</para>
 
 		<para>Example: <command>pdbedit -a -u sorce</command>
 		<programlisting>new password:
@@ -227,7 +227,7 @@
 		<varlistentry>
 		<term>-x</term>
 		<listitem><para>This option causes pdbedit to delete an account
-		from the database. It need the username be specified with the
+		from the database. It needs a username specified with the
 		-u switch.</para>
 
 		<para>Example: <command>pdbedit -x -u bob</command></para>
@@ -237,22 +237,25 @@
 
 		<varlistentry>
 		<term>-i passdb-backend</term>
-		<listitem><para>Use a different passdb backend to retrieve users than the one specified in smb.conf. Can be used to import data into your 
-		local user database.</para>
+		<listitem><para>Use a different passdb backend to retrieve users
+                than the one specified in smb.conf. Can be used to import data into
+                your local user database.</para>
 
-		<para>This option will ease migration from one passdb backend to another.
-		</para>
+		<para>This option will ease migration from one passdb backend to
+		another.</para>
 
-		<para>Example: <command>pdbedit -i smbpasswd:/etc/smbpasswd.old</command>
-		</para>
+		<para>Example: <command>pdbedit -i smbpasswd:/etc/smbpasswd.old
+                </command></para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
 		<term>-e passdb-backend</term>
-		<listitem><para>Export all currently available users to the specified password database backend.</para>
+		<listitem><para>Exports all currently available users to the
+		specified password database backend.</para>
 
-		<para>This option will ease migration from one passdb backend to another and will ease backupping</para>
+		<para>This option will ease migration from one passdb backend to
+		another and will ease backing up.</para>
 		
 		<para>Example: <command>pdbedit -e smbpasswd:/root/samba-users.backup</command></para>
 		</listitem>
diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index f1ba474cfb..7a7a19c837 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -127,8 +127,8 @@
 		<varlistentry>
 		<term>-l|--logfile=logbasename</term>
 		<listitem><para>File name for log/debug files. The extension 
-		<constant>'.client'</constant> will be appended. The log file is never removed  
-		by the client.
+		<constant>'.client'</constant> will be appended. The log file is
+		never removed by the client.
 		</para></listitem>
 		</varlistentry>
 
@@ -137,14 +137,15 @@
 		<varlistentry>
 		<term>-N|--nopass</term>
 		<listitem><para>instruct <command>rpcclient</command> not to ask 
-		for a password.   By default, <command>rpcclient</command> will prompt 
-		for a password.  See also the <parameter>-U</parameter> option.</para></listitem>
+		for a password.   By default, <command>rpcclient</command> will
+		prompt for a password.  See also the <parameter>-U</parameter>
+		option.</para></listitem>
 		</varlistentry>
 
 		
 		<varlistentry>
 		<term>-s|--conf=smb.conf</term>
-		<listitem><para>Specifies the location of the all important 
+		<listitem><para>Specifies the location of the all-important 
 		<filename>smb.conf</filename> file. </para></listitem>
 		</varlistentry>
 
@@ -162,8 +163,8 @@
 
 		<para>A third option is to use a credentials file which 
 		contains the plaintext of the username and password.  This 
-		option is mainly provided for scripts where the admin doesn't 
-		desire to pass the credentials on the command line or via environment 
+		option is mainly provided for scripts where the admin does not 
+		wish to pass the credentials on the command line or via environment 
 		variables. If this method is used, make certain that the permissions 
 		on the file restrict access from unwanted users.  See the 
 		<parameter>-A</parameter> for more details. </para>
@@ -203,7 +204,7 @@
 		of SIDs to usernames.
 		</para></listitem>
 		
-		<listitem><para><command>lookupnames</command> - Resolve s list 
+		<listitem><para><command>lookupnames</command> - Resolve a list 
 		of usernames to SIDs.
 		</para></listitem>
 		
@@ -290,7 +291,7 @@
 
 
 		<listitem><para><command>enumjobs &lt;printer&gt;</command> 
-		- List the jobs and status of a given printer.  
+		- List the jobs and status of a given printer. 
 		This command corresponds to the MS Platform SDK EnumJobs() 
 		function (* This command is currently unimplemented).</para></listitem>
 		
@@ -339,7 +340,7 @@
 
 		<listitem><para><command>getdriverdir &lt;arch&gt;</command> 
 		- Execute a GetPrinterDriverDirectory()
-		RPC to retreive the SMB share name and subdirectory for 
+		RPC to retrieve the SMB share name and subdirectory for 
 		storing printer driver files for a given architecture.  Possible 
 		values for <parameter>arch</parameter> are "Windows 4.0" 
 		(for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows
@@ -359,10 +360,11 @@
 		against a given printer. </para></listitem> 
 
 
-		<listitem><para><command>setdriver &lt;printername&gt; &lt;drivername&gt;</command> 
-		- Execute a SetPrinter() command to update the printer driver associated
-		with an installed printer.  The printer driver must already be correctly
-		installed on the print server.  </para>
+		<listitem><para><command>setdriver &lt;printername&gt;
+		&lt;drivername&gt;</command>
+		- Execute a SetPrinter() command to update the printer driver
+		associated with an installed printer.  The printer driver must
+		already be correctly installed on the print server.  </para>
 
 		<para>See also the <command>enumprinters</command> and 
 		<command>enumdrivers</command> commands for obtaining a list of
@@ -374,8 +376,8 @@
 	<para><emphasis>GENERAL OPTIONS</emphasis></para>
 
 	<itemizedlist>
-		<listitem><para><command>debuglevel</command> - Set the current debug level
-		used to log information.</para></listitem>
+		<listitem><para><command>debuglevel</command> - Set the current
+		debug level used to log information.</para></listitem>
 
 		<listitem><para><command>help (?)</command> - Print a listing of all 
 		known commands or extended help  on a particular command. 
diff --git a/docs/docbook/manpages/samba.7.sgml b/docs/docbook/manpages/samba.7.sgml
index 5d81d9d446..ce443e78d9 100644
--- a/docs/docbook/manpages/samba.7.sgml
+++ b/docs/docbook/manpages/samba.7.sgml
@@ -22,8 +22,10 @@
 	<para>The Samba software suite is a collection of programs 
 	that implements 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.</para>
+	also referred to as the Common Internet File System (CIFS). For a
+	more thorough description, see <ulink url="http://www.ubiqx.org/cifs/">
+	http://www.ubiqx.org/cifs/</ulink>. Samba also implements the NetBIOS
+	protocol in nmbd.</para>
 	
 	<variablelist>
 		<varlistentry>
@@ -39,7 +41,7 @@
 		<varlistentry>
 		<term><command>nmbd</command></term>
 		<listitem><para>The <command>nmbd</command>
-		daemon provides NetBIOS nameserving and browsing
+		daemon provides NetBIOS nameservice and browsing
 		support. The configuration file for this daemon 
 		is described in <filename>smb.conf</filename></para>
 		</listitem>
@@ -68,7 +70,7 @@
 		<term><command>testprns</command></term>
 		<listitem><para>The <command>testprns</command>
 		utility supports testing printer names defined 
-		in your <filename>printcap></filename> file used 
+		in your <filename>printcap</filename> file used 
 		by Samba.</para>
 		</listitem>
 		</varlistentry>
@@ -115,12 +117,14 @@
 	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 or 
-	bug report to <ulink url="mailto:samba@samba.org">
-	samba@samba.org</ulink></para>
-	
-	
+	manual pages and documents aren't clear enough then please visit
+	<ulink url="http://devel.samba.org/">http://devel.samba.org</ulink>
+	for information on how to file a bug report or submit a patch.</para>
 
+	<para>If you require help, visit the Samba webpage at
+	<ulink url="http://samba.org/">http://www.samba.org/</ulink> and
+	explore the many option available to you.
+	
 </refsect1>
 
 <refsect1>
@@ -164,11 +168,10 @@
 	<ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.
 	</para>
 
-	<para>If you have patches to submit or bugs to report 
-	then you may mail them directly to samba-patches@samba.org.
-	Note, however, that due to the enormous popularity of this 
-	package the Samba Team may take some time to respond to mail. We 
-	prefer patches in <command>diff -u</command> format.</para>
+	<para>If you have patches to submit, visit
+	<ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>
+	for information on how to do it properly. We prefer patches in
+	<command>diff -u</command> format.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 89ffa0934a..d22ed39de5 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -2894,9 +2894,9 @@
 		system print command such as <command>lpr(1)</command> or <command>
 		lp(1)</command>.</para>
 
-	        <para>This paramater does not accept % marcos, becouse
+	        <para>This paramater does not accept % macros, because
 	        many parts of the system require this value to be
-	        constant for correct operation</para>
+	        constant for correct operation.</para>
 		
 		<para>Default: <emphasis>specified at compile time, usually 
 		"nobody"</emphasis></para>
diff --git a/docs/docbook/manpages/smbcacls.1.sgml b/docs/docbook/manpages/smbcacls.1.sgml
index 69aa967492..766d2a78b1 100644
--- a/docs/docbook/manpages/smbcacls.1.sgml
+++ b/docs/docbook/manpages/smbcacls.1.sgml
@@ -35,8 +35,8 @@
 	<para>This tool is part of the <ulink url="samba.7.html">
 	Samba</ulink> suite.</para>
 	
-	<para>The <command>smbcacls</command> program manipulates NT Access Control Lists 
-	(ACLs) on SMB file shares. </para>
+	<para>The <command>smbcacls</command> program manipulates NT Access Control
+	Lists (ACLs) on SMB file shares. </para>
 </refsect1>
 
 
@@ -79,7 +79,7 @@
 		<term>-S acls</term>
 		<listitem><para>This command sets the ACLs on the file with 
 		only the ones specified on the command line.  All other ACLs are 
-		erased.  Note that the ACL specified must contain at least a revision, 
+		erased. Note that the ACL specified must contain at least a revision,
 		type, owner and group for the call to succeed. </para></listitem>
 		</varlistentry>
 		
diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml
index 9a6f31b336..166ef63e87 100644
--- a/docs/docbook/manpages/smbcontrol.1.sgml
+++ b/docs/docbook/manpages/smbcontrol.1.sgml
@@ -121,7 +121,7 @@
 
 		<para>The <constant>printnotify</constant> message-type sends a 
 		message to smbd which in turn sends a printer notify message to 
-		any Windows NT clients connected to  a printer. This message-type
+		any Windows NT clients connected to a printer. This message-type
 		takes the following arguments:
 
 		<variablelist>
diff --git a/docs/docbook/manpages/smbgroupedit.8.sgml b/docs/docbook/manpages/smbgroupedit.8.sgml
index b9607312ff..53bc0bec61 100644
--- a/docs/docbook/manpages/smbgroupedit.8.sgml
+++ b/docs/docbook/manpages/smbgroupedit.8.sgml
@@ -19,7 +19,7 @@
 	<cmdsynopsis>
 		<command>smbroupedit</command>
 		<arg choice="opt">-v [l|s]</arg>
-		<arg choice="opt">-a UNIX-groupname [-d NT-groupname|-p prividge|</arg>
+		<arg choice="opt">-a UNIX-groupname [-d NT-groupname|-p privilege|]</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -73,10 +73,10 @@ etc.
 <para>For examples,</para>
 <para><programlisting>
 Users
-    SID : S-1-5-32-545
+    SID       : S-1-5-32-545
     Unix group: -1
     Group type: Local group
-    Comment :
+    Comment   :
     Privilege : No privilege
 </programlisting></para>
 
@@ -195,7 +195,7 @@ Domain Admins (S-1-5-21-1108995562-3116817432-1375597819-512) -> -1
 </orderedlist>
 
 <para>
-To verify that you mapping has taken effect:
+To verify that your mapping has taken effect:
 </para>
 
 <para><programlisting>
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
index ec4dbbaff1..c4b91a5572 100644
--- a/docs/docbook/manpages/smbmount.8.sgml
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -73,7 +73,7 @@
 		given. </para>
 
 		<para>
-		Note that password which contain the arguement delimiter
+		Note that passwords which contain the argument delimiter
 		character (i.e. a comma ',') will failed to be parsed correctly
 		on the command line.  However, the same password defined
 		in the PASSWD environment variable or a credentials file (see
@@ -222,7 +222,7 @@
 		<varlistentry>
 		<term>ttl=&lt;arg&gt;</term>
 		<listitem><para>
-		how long a directory listing is cached in milliseconds
+		sets how long a directory listing is cached in milliseconds
 		(also affects visibility of file size and date
 		changes). A higher value means that changes on the
 		server take longer to be noticed but it can give
diff --git a/docs/docbook/manpages/smbpasswd.8.sgml b/docs/docbook/manpages/smbpasswd.8.sgml
index 3c7a6a5150..c0b7ac3359 100644
--- a/docs/docbook/manpages/smbpasswd.8.sgml
+++ b/docs/docbook/manpages/smbpasswd.8.sgml
@@ -24,7 +24,6 @@
 		<arg choice="opt">-r &lt;remote machine&gt;</arg>	
 		<arg choice="opt">-R &lt;name resolve order&gt;</arg>	
 		<arg choice="opt">-m</arg>	
-		<arg choice="opt">-j DOMAIN</arg>	
 		<arg choice="opt">-U username[%password]</arg>	
 		<arg choice="opt">-h</arg>	
 		<arg choice="opt">-s</arg>	
@@ -56,7 +55,7 @@
 	UNIX machine the encrypted SMB passwords are usually stored in 
 	the <filename>smbpasswd(5)</filename> file. </para>
 
-	<para>When run by an ordinary user with no options. smbpasswd 
+	<para>When run by an ordinary user with no options, smbpasswd 
 	will prompt them for their old SMB password and then ask them 
 	for their new password twice, to ensure that the new password
 	was typed correctly. No passwords will be echoed on the screen 
@@ -89,7 +88,7 @@
 		password command.  Note that the default passdb backends require 
                 the user to already exist in the system password file (usually 
                 <filename>/etc/passwd</filename>), else the request to add the 
-                user will fail.  </para>
+                user will fail. </para>
 		
 		<para>This option is only available when running smbpasswd 
 		as root. </para></listitem>
@@ -220,12 +219,12 @@
 		
 		<varlistentry>
 		<term>-R name resolve order</term>
-		<listitem><para>This option allows the user of smbpasswd to determine 
+		<listitem><para>This option allows the user of smbpasswd to determine
 		what name resolution services to use when looking up the NetBIOS
 		name of the host being connected to. </para>
 
-		<para>The options are :"lmhosts", "host", "wins" and "bcast". They cause 
-		names to be resolved as follows : </para>
+		<para>The options are :"lmhosts", "host", "wins" and "bcast". They
+		 cause names to be resolved as follows : </para>
 			<itemizedlist>
 				<listitem><para><constant>lmhosts</constant> : Lookup an IP 
             address in the Samba lmhosts file. If the line in lmhosts has 
@@ -244,14 +243,14 @@
 
             <listitem><para><constant>wins</constant> : Query a name with 
             the IP address listed in the <parameter>wins server</parameter> 
-				parameter.  If no WINS server has been specified this method 
-				will be ignored.</para></listitem>
+	    parameter.  If no WINS server has been specified this method 
+	    will be ignored.</para></listitem>
 
             <listitem><para><constant>bcast</constant> : Do a broadcast on 
             each of the known local interfaces listed in the
             <parameter>interfaces</parameter> parameter. This is the least 
-				reliable of the name resolution methods as it depends on the 
-				target host being on a locally connected subnet.</para></listitem>
+	    reliable of the name resolution methods as it depends on the 
+	    target host being on a locally connected subnet.</para></listitem>
 		</itemizedlist>
 		
 		<para>The default order is <command>lmhosts, host, wins, bcast</command> 
@@ -267,7 +266,7 @@
 		being changed is a MACHINE account. Currently this is used 
 		when Samba is being used as an NT Primary Domain Controller.</para>
 
-		<para>This option is only available when running smbpasswd as root. 	
+		<para>This option is only available when running smbpasswd as root.
 		</para></listitem>
 		</varlistentry>
 		
@@ -305,15 +304,15 @@
 
 		<varlistentry>
 		<term>-w password</term>
-		<listitem><para>This parameter is only available is Samba
-		has been configured to use the experiemental
+		<listitem><para>This parameter is only available if Samba
+		has been configured to use the experimental
 		<command>--with-ldapsam</command> option. The <parameter>-w</parameter> 
 		switch is used to specify the password to be used with the 
 		<ulink url="smb.conf.5.html#LDAPADMINDN"><parameter>ldap admin 
 		dn</parameter></ulink>.  Note that the password is stored in
 		the <filename>private/secrets.tdb</filename> and is keyed off 
 		of the admin's DN.  This means that if the value of <parameter>ldap
-		admin dn</parameter> ever changes, the password will beed to be 
+		admin dn</parameter> ever changes, the password will need to be 
 		manually updated as well.
 		</para>
 		</listitem>
diff --git a/docs/docbook/manpages/smbspool.8.sgml b/docs/docbook/manpages/smbspool.8.sgml
index d5c9c0a114..d164cb0864 100644
--- a/docs/docbook/manpages/smbspool.8.sgml
+++ b/docs/docbook/manpages/smbspool.8.sgml
@@ -9,7 +9,7 @@
 
 <refnamediv>
 	<refname>smbspool</refname>
-	<refpurpose>send print file to an SMB printer</refpurpose>
+	<refpurpose>send a print file to an SMB printer</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -79,11 +79,11 @@
 
 		<listitem><para>The copies argument (argv[4]) contains 
 		the number of copies to be printed of the named file. If 
-		no filename is provided than this argument is not used by 
+		no filename is provided then this argument is not used by 
 		smbspool.</para></listitem>
 
 		<listitem><para>The options argument (argv[5]) contains 
-		the print options in a single string and is presently 
+		the print options in a single string and is currently 
 		not used by smbspool.</para></listitem>
 
 		<listitem><para>The filename argument (argv[6]) contains the 
diff --git a/docs/docbook/manpages/smbtar.1.sgml b/docs/docbook/manpages/smbtar.1.sgml
index d1585d7ca3..bd70493b6b 100644
--- a/docs/docbook/manpages/smbtar.1.sgml
+++ b/docs/docbook/manpages/smbtar.1.sgml
@@ -164,7 +164,7 @@
 	<title>BUGS</title>
 
 	<para>The <command>smbtar</command> script has different 
-	options from ordinary tar and tar called from smbclient. </para>
+	options from ordinary tar and from smbclient's tar command. </para>
 
 </refsect1>
 
@@ -173,7 +173,7 @@
 
 	<para>Sites that are more careful about security may not like 
 	the way the script handles PC passwords. Backup and restore work 
-	on entire shares, should work on file lists. smbtar works best
+	on entire shares; should work on file lists. smbtar works best
 	with GNU tar and may not work well with other versions. </para>
 </refsect1>
 
diff --git a/docs/docbook/manpages/swat.8.sgml b/docs/docbook/manpages/swat.8.sgml
index dc6989d566..c0052f3d53 100644
--- a/docs/docbook/manpages/swat.8.sgml
+++ b/docs/docbook/manpages/swat.8.sgml
@@ -62,7 +62,7 @@
 		<command>swat</command> in demo mode. In that mode anyone will be able to modify 
 		the <filename>smb.conf</filename> file. </para>
 		
-		<para><emphasis>Do NOT enable this option on a production 
+		<para><emphasis>WARNING: Do NOT enable this option on a production 
 		server. </emphasis></para></listitem>
 		</varlistentry>
 	</variablelist>
@@ -168,7 +168,7 @@
 
 	<para><command>swat</command> will rewrite your <filename>smb.conf
 	</filename> file. It will rearrange the entries and delete all 
-	comments, <parameter>include=</parameter> and <parameter>copy="
+	comments, <parameter>include=</parameter> and <parameter>copy=
 	</parameter> options. If you have a carefully crafted <filename>
 	smb.conf</filename> then back it up or don't use swat! </para>
 </refsect1>
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index 0325f9bfe1..32ea86b0d6 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -46,10 +46,10 @@
 	<para>
 	The <filename>pam_winbind</filename> module in the 2.2.2 release only 
 	supports the <parameter>auth</parameter> and <parameter>account</parameter> 
-	module-types.  The latter is simply
+	module-types.  The latter simply
 	performs a getpwnam() to verify that the system can obtain a uid for the
 	user.  If the <filename>libnss_winbind</filename> library has been correctly 
-	installed, this should always suceed.
+	installed, this should always succeed.
 	</para>
 
 	<para>The following nsswitch databases are implemented by 
@@ -156,156 +156,26 @@ group:          files winbind
 	</filename> file.  All parameters should be specified in the 
 	[global] section of smb.conf. </para>
 
-	<variablelist>
-		<varlistentry>
-		<term>winbind separator</term>
-		<listitem><para>The winbind separator option allows you 
-		to specify how NT domain names and user names are combined 
-		into unix user names when presented to users. By default, 
-		<command>winbindd</command> will use the traditional '\' 
-		separator so that the unix user names look like 
-		DOMAIN\username. In some cases this separator character may 
-		cause problems as the '\' character has special meaning in 
-		unix shells.  In that case you can use the winbind separator 
-		option to specify an alternative separator character. Good 
-		alternatives may be '/' (although that conflicts
-		with the unix directory separator) or a '+ 'character. 
-		The '+' character appears to be the best choice for 100% 
-		compatibility with existing unix utilities, but may be an 
-		aesthetically bad choice depending on your taste. </para>
-		
-		<para>Default: <command>winbind separator = \ </command>
-		</para>
-		<para>Example: <command>winbind separator = + </command></para>
-		</listitem>
-		</varlistentry>
-
-		<varlistentry>
-		<term>winbind uid</term>
-		<listitem><para>The winbind uid parameter specifies the 
-		range of user ids that are allocated by the winbindd daemon.  
-		This range of ids should have no existing local or NIS users 
-		within it as strange conflicts can occur otherwise. </para>
-
-		<para>Default: <command>winbind uid = &lt;empty string&gt; 
-		</command></para>
-		<para>Example: <command>winbind uid = 10000-20000</command></para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term>winbind gid</term>
-		<listitem><para>The winbind gid parameter specifies the 
-		range of group ids that are allocated by the winbindd daemon.  
-		This range of group ids should have no existing local or NIS 
-		groups within it as strange conflicts can occur otherwise.</para> 
-
-		<para>Default: <command>winbind gid = &lt;empty string&gt;
-		</command></para> 	
-		<para>Example: <command>winbind gid = 10000-20000
-		</command> </para></listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term>winbind cache time</term>
-		<listitem><para>This parameter specifies the number of 
-		seconds the winbindd daemon will cache user and group information 
-		before querying a Windows NT server again. When a item in the 
-		cache is older than this time winbindd will ask the domain 
-		controller for the sequence number of the server's account database. 
-		If the sequence number has not changed then the cached item is 
-		marked as valid for a further <parameter>winbind cache time
-		</parameter> seconds.  Otherwise the item is fetched from the 
-		server. This means that as long as the account database is not 
-		actively changing winbindd will only have to send one sequence 
-		number query packet every <parameter>winbind cache time
-		</parameter> seconds. </para>
-
-		<para>Default: <command>winbind cache time = 15</command>
-		</para></listitem>
-		</varlistentry>
-		
-		<varlistentry>
-		<term>winbind enum users</term>
-		<listitem><para>On large installations it may be necessary 
-		to suppress the enumeration of users through the <command>
-		setpwent()</command>, <command>getpwent()</command> and 
-		<command>endpwent()</command> group of system calls.  If 
-		the <parameter>winbind enum users</parameter> parameter is false, 
-		calls to the <command>getpwent</command> system call will not 
-		return any data. </para>
-
-		<para><emphasis>Warning:</emphasis> Turning off user enumeration 
-		may cause some programs to behave oddly.  For example, the <command>finger</command> 
-		program relies on having access to the full user list when 
-		searching  for matching usernames. </para>
-
-		<para>Default: <command>winbind enum users = yes </command></para>
-		</listitem>
-		</varlistentry>
-		
-		<varlistentry>
-		<term>winbind enum groups</term>
-		<listitem><para>On large installations it may be necessary 
-		to suppress the enumeration of groups through the <command>
-		setgrent()</command>, <command>getgrent()</command> and 
-		<command>endgrent()</command> group of system calls.  If 
-		the <parameter>winbind enum groups</parameter> parameter is 
-		false, calls to the <command>getgrent()</command> system 
-		call will not return any data. </para>
-
-		<para><emphasis>Warning:</emphasis> Turning off group 
-		enumeration may cause some programs to behave oddly. 
-		</para>
-
-		<para>Default: <command>winbind enum groups = no </command>
-		</para></listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term>template homedir</term>
-		<listitem><para>When filling out the user information 
-		for a Windows NT user, the <command>winbindd</command> daemon 
-		uses this parameter to fill in the home directory for that user.  
-		If the string <parameter>%D</parameter> is present it is 
-		substituted with the user's Windows NT domain name.  If the 
-		string <parameter>%U</parameter> is present it is substituted
-		with the user's Windows NT user name. </para>
-
-		<para>Default: <command>template homedir = /home/%D/%U </command>
-		</para></listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term>template shell</term>
-		<listitem><para>When filling out the user information for 
- 		a Windows NT user, the <command>winbindd</command> daemon 
-		uses this parameter to fill in the shell for that user. 
-		</para>
-
-		<para>Default: <command>template shell = /bin/false </command>
-		</para></listitem>
-		</varlistentry>
-
-		<varlistentry>
-		<term>winbind use default domain</term>
-		<listitem><para>This parameter specifies whether the <command>winbindd</command>
-		daemon should operate on users without domain component in their username.  
-                Users without a domain component are treated as is part of the winbindd server's 
-                own domain.  While this does not benifit Windows users, it makes SSH, FTP and e-mail 
-                function in a way much closer to the way they would in a native unix system.</para>
-		
-		<para>Default: <command>winbind use default domain = &lt;falseg&gt; 
-		</command></para>
-		<para>Example: <command>winbind use default domain = true</command></para>
-		</listitem>
-		</varlistentry>
-	</variablelist>
+	<itemizedlist>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDSEPARATOR">
+		<parameter>winbind separator</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDUID">
+		<parameter>winbind uid</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDGID">
+		<parameter>winbind gid</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDCACHETIME">
+		<parameter>winbind cache time</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDENUMUSERS">
+		<parameter>winbind enum users</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDENUMGROUPS">
+		<parameter>winbind enum groups</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#TEMPLATEHOMEDIR">
+		<parameter>template homedir</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#TEMPLATESHELL">
+		<parameter>template shell</parameter></ulink></para></listitem>
+		<listitem><para><ulink url="smb.conf.5.html#WINBINDUSEDEFAULTDOMAIN">
+		<parameter>winbind use default domain</parameter></ulink></para></listitem>
+	</itemizedlist>
 </refsect1>