From 384ff3157007cb6cfc368a1ca89a225ade4efc58 Mon Sep 17 00:00:00 2001
From: John Bradshaw <john@johnbradshaw.org>
Date: Fri, 28 Jan 2011 12:47:32 +0000
Subject: [PATCH] Manpage fixes

---
 docs-xml/manpages-3/idmap_ldap.8.xml               |    4 ++--
 docs-xml/manpages-3/idmap_nss.8.xml                |    2 +-
 docs-xml/manpages-3/idmap_tdb.8.xml                |    4 ++--
 docs-xml/manpages-3/idmap_tdb2.8.xml               |    4 ++--
 docs-xml/manpages-3/ldbadd.1.xml                   |    2 +-
 docs-xml/manpages-3/ldbdel.1.xml                   |    2 +-
 docs-xml/manpages-3/ldbmodify.1.xml                |    2 +-
 docs-xml/manpages-3/ldbrename.1.xml                |    2 +-
 docs-xml/manpages-3/ldbsearch.1.xml                |    4 ++--
 docs-xml/manpages-3/libsmbclient.7.xml             |    2 +-
 docs-xml/manpages-3/mount.cifs.8.xml               |   14 ++++++++------
 docs-xml/manpages-3/net.8.xml                      |    6 +++---
 docs-xml/manpages-3/ntlm_auth.1.xml                |   18 +++++++++---------
 docs-xml/manpages-3/pdbedit.8.xml                  |   20 ++++++++++----------
 docs-xml/manpages-3/profiles.1.xml                 |    2 +-
 docs-xml/manpages-3/rpcclient.1.xml                |    2 +-
 docs-xml/manpages-3/samba.7.xml                    |    2 +-
 docs-xml/manpages-3/smb.conf.5.xml                 |    2 +-
 docs-xml/manpages-3/smbclient.1.xml                |   14 +++++++-------
 docs-xml/manpages-3/smbcontrol.1.xml               |    2 +-
 docs-xml/manpages-3/smbcquotas.1.xml               |    2 +-
 docs-xml/manpages-3/smbd.8.xml                     |    8 ++++----
 docs-xml/manpages-3/smbget.1.xml                   |    2 +-
 docs-xml/manpages-3/tdbbackup.8.xml                |    4 ++--
 docs-xml/manpages-3/testparm.1.xml                 |    2 +-
 docs-xml/manpages-3/umount.cifs.8.xml              |    6 +++---
 docs-xml/manpages-3/vfs_fake_perms.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_readonly.8.xml             |    2 +-
 docs-xml/manpages-3/vfs_shadow_copy2.8.xml         |    2 +-
 docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml |    6 +++---
 docs-xml/manpages-3/winbindd.8.xml                 |    2 +-
 31 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml b/docs-xml/manpages-3/idmap_ldap.8.xml
index 550b37c..712d5e3 100644
--- a/docs-xml/manpages-3/idmap_ldap.8.xml
+++ b/docs-xml/manpages-3/idmap_ldap.8.xml
@@ -35,14 +35,14 @@
 
 	<para>
 	Note that in order for this (or any other allocating) backend to
-	function at all, the default backend needs to be writeable.
+	function at all, the default backend needs to be writable.
 	The ranges used for uid and gid allocation are the default ranges
 	configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
 	</para>
 
 	<para>
 	Furthermore, since there is only one global allocating backend
-	responsible for all domains using writeable idmap backends,
+	responsible for all domains using writable idmap backends,
 	any explicitly configured domain with idmap backend ldap
 	should have the same range as the default range, since it needs
 	to use the global uid / gid allocator. See the example below.
diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages-3/idmap_nss.8.xml
index 3c04f51..edc7f75 100644
--- a/docs-xml/manpages-3/idmap_nss.8.xml
+++ b/docs-xml/manpages-3/idmap_nss.8.xml
@@ -20,7 +20,7 @@
 	<title>DESCRIPTION</title>
 
 	<para>The idmap_nss plugin provides a means to map Unix users and groups
-	to Windows accounts and obseletes the &quot;winbind trusted domains only&quot;
+	to Windows accounts and obsoletes the &quot;winbind trusted domains only&quot;
 	smb.conf option.  This provides a simple means of ensuring that the SID
 	for a Unix user named jsmith is reported as the one assigned to
 	DOMAIN\jsmith which is necessary for reporting ACLs on files and printers
diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages-3/idmap_tdb.8.xml
index 7b1c3f8..e486dcf 100644
--- a/docs-xml/manpages-3/idmap_tdb.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb.8.xml
@@ -35,14 +35,14 @@
 
 	<para>
 	Note that in order for this (or any other allocating) backend to
-	function at all, the default backend needs to be writeable.
+	function at all, the default backend needs to be writable.
 	The ranges used for uid and gid allocation are the default ranges
 	configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
 	</para>
 
 	<para>
 	Furthermore, since there is only one global allocating backend
-	responsible for all domains using writeable idmap backends,
+	responsible for all domains using writable idmap backends,
 	any explicitly configured domain with idmap backend tdb
 	should have the same range as the default range, since it needs
 	to use the global uid / gid allocator. See the example below.
diff --git a/docs-xml/manpages-3/idmap_tdb2.8.xml b/docs-xml/manpages-3/idmap_tdb2.8.xml
index b4490a4..f0a4e32 100644
--- a/docs-xml/manpages-3/idmap_tdb2.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb2.8.xml
@@ -36,14 +36,14 @@
 
 	<para>
 	Note that in order for this (or any other allocating) backend to
-	function at all, the default backend needs to be writeable.
+	function at all, the default backend needs to be writable.
 	The ranges used for uid and gid allocation are the default ranges
 	configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
 	</para>
 
 	<para>
 	Furthermore, since there is only one global allocating backend
-	responsible for all domains using writeable idmap backends,
+	responsible for all domains using writable idmap backends,
 	any explicitly configured domain with idmap backend tdb2
 	should have the same range as the default range, since it needs
 	to use the global uid / gid allocator. See the example below.
diff --git a/docs-xml/manpages-3/ldbadd.1.xml b/docs-xml/manpages-3/ldbadd.1.xml
index 811873e..be4ad5e 100644
--- a/docs-xml/manpages-3/ldbadd.1.xml
+++ b/docs-xml/manpages-3/ldbadd.1.xml
@@ -68,7 +68,7 @@
 
 	<variablelist>
 		<varlistentry><term>LDB_URL</term>
-			<listitem><para>LDB URL to connect to (can be overrided by using the 
+			<listitem><para>LDB URL to connect to (can be overridden using the 
 					-H command-line option.)</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs-xml/manpages-3/ldbdel.1.xml b/docs-xml/manpages-3/ldbdel.1.xml
index 6773d53..ab8f1e6 100644
--- a/docs-xml/manpages-3/ldbdel.1.xml
+++ b/docs-xml/manpages-3/ldbdel.1.xml
@@ -66,7 +66,7 @@
 
 	<variablelist>
 		<varlistentry><term>LDB_URL</term>
-			<listitem><para>LDB URL to connect to (can be overrided by using the 
+			<listitem><para>LDB URL to connect to (can be overridden using the 
 					-H command-line option.)</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs-xml/manpages-3/ldbmodify.1.xml b/docs-xml/manpages-3/ldbmodify.1.xml
index 1950a68..8e3f697 100644
--- a/docs-xml/manpages-3/ldbmodify.1.xml
+++ b/docs-xml/manpages-3/ldbmodify.1.xml
@@ -56,7 +56,7 @@
 
 	<variablelist>
 		<varlistentry><term>LDB_URL</term>
-			<listitem><para>LDB URL to connect to (can be overrided by using the 
+			<listitem><para>LDB URL to connect to (can be overridden using the 
 					-H command-line option.)</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages-3/ldbrename.1.xml
index 1a89bae..e36082f 100644
--- a/docs-xml/manpages-3/ldbrename.1.xml
+++ b/docs-xml/manpages-3/ldbrename.1.xml
@@ -70,7 +70,7 @@
 
 	<variablelist>
 		<varlistentry><term>LDB_URL</term>
-			<listitem><para>LDB URL to connect to (can be overrided by using the 
+			<listitem><para>LDB URL to connect to (can be overridden using the 
 					-H command-line option.)</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs-xml/manpages-3/ldbsearch.1.xml b/docs-xml/manpages-3/ldbsearch.1.xml
index ac8acb0..a0a7998 100644
--- a/docs-xml/manpages-3/ldbsearch.1.xml
+++ b/docs-xml/manpages-3/ldbsearch.1.xml
@@ -22,7 +22,7 @@
 		<arg choice="opt">-h</arg>
 		<arg choice="opt">-s base|one|sub</arg>
 		<arg choice="opt">-b basedn</arg>
-		<arg chioce="opt">-i</arg>
+		<arg choice="opt">-i</arg>
 		<arg choice="opt">-H LDB-URL</arg>
 		<arg choice="opt">expression</arg>
 		<arg choice="opt">attributes</arg>
@@ -82,7 +82,7 @@
 
 	<variablelist>
 		<varlistentry><term>LDB_URL</term>
-			<listitem><para>LDB URL to connect to (can be overrided by using the 
+			<listitem><para>LDB URL to connect to (can be overridden using the 
 					-H command-line option.)</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml
index 43418e2..ab5c981 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -71,7 +71,7 @@
 			responsibility of the application that calls this library to set this to a sensible value.  This
 			is a compile-time option. This value determines the maximum number of local master browsers to
 			query for the list of workgroups.  In order to ensure that the list is complete for those present
-			on the network, all master browsers must be querried. If there are a large number of workgroups
+			on the network, all master browsers must be queried. If there are a large number of workgroups
 			on the network, the time spent querying will be significant. For small networks (just a few
 			workgroups), it is suggested to set this value to 0, instructing libsmbclient to query all local
 			master browsers. In an environment that has many workgroups a more reasonable setting may be around 3.
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index c4fe2e8..3f6a769 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -344,7 +344,9 @@ permissions in memory that can't be stored on the server. This information can d
 
         <varlistentry>
                 <term>mapchars</term>
-                <listitem><para>Translate six of the seven reserved characters (not backslash, but including the colon, question mark, pipe, asterik, greater than and less than characters)
+                <listitem><para>Translate six of the seven reserved characters (not backslash,
+                but including the colon, question mark, pipe, asterisk,
+                greater than and less than characters)
                 to the remap range (above 0xF000), which also
                 allows the CIFS client to recognize files created with
                 such characters by Windows's POSIX emulation. This can
@@ -398,7 +400,7 @@ permissions in memory that can't be stored on the server. This information can d
                 <term>nocase</term>
                 <listitem>
 		<para>Request case insensitive path name matching (case
-                sensitive is the default if the server suports it).
+                sensitive is the default if the server supports it).
 		</para>
                 </listitem>
         </varlistentry>
@@ -461,7 +463,7 @@ permissions in memory that can't be stored on the server. This information can d
                 temporary inode numbers on the client.  Although server inode numbers
                 make it easier to spot hardlinked files (as they will have
                 the same inode numbers) and inode numbers may be persistent (which is
-		userful for some sofware),
+		useful for some software),
                 the server does not guarantee that the inode numbers
                 are unique if multiple server side mounts are exported under a
                 single share (since inode numbers on the servers might not
@@ -548,7 +550,7 @@ permissions in memory that can't be stored on the server. This information can d
 	<title>SERVICE FORMATTING AND DELIMITERS</title>
 
 	<para>
-		It's generally preferred to use forward slashes (/) as a delimiter in service names. They are considered to be the "universal delimiter" since they are generally not allowed to be embedded within path components on Windows machines and the client can convert them to blackslashes (\) unconditionally. Conversely, backslash characters are allowed by POSIX to be part of a path component, and can't be automatically converted in the same way.
+		It's generally preferred to use forward slashes (/) as a delimiter in service names. They are considered to be the "universal delimiter" since they are generally not allowed to be embedded within path components on Windows machines and the client can convert them to backslashes (\) unconditionally. Conversely, backslash characters are allowed by POSIX to be part of a path component, and can't be automatically converted in the same way.
 	</para>
 	<para>
 		mount.cifs will attempt to convert backslashes to forward slashes where it's able to do so, but it cannot do so in any path component following the sharename.
@@ -617,7 +619,7 @@ the inode cache). In general, this mount option is discouraged.
 
 	<para>It's also possible to override permission checking on the client
 altogether via the noperm option. Server-side permission checks cannot be
-overriden. The permission checks done by the server will always correspond to
+overridden. The permission checks done by the server will always correspond to
 the credentials used to mount the share, and not necessarily to the user who is accessing the share.</para>
 
 </refsect1>
@@ -705,7 +707,7 @@ server type you are trying to contact.
 <refsect1>
 	<title>SEE ALSO</title>
 	<para>
-	Documentation/filesystems/cifs.txt and fs/cifs/README in the linux kernel
+	Documentation/filesystems/cifs.txt and fs/cifs/README in the Linux kernel
 	source tree may contain additional options and information.
 </para>
         <para><citerefentry><refentrytitle>umount.cifs</refentrytitle>
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index f7fafcc..98b08d6 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1526,12 +1526,12 @@ registry.
 </refsect3>
 
 <refsect3>
-<title>CONF ADDSHARE <replaceable>sharename</replaceable> <replaceable>path</replaceable> [<replaceable>writeable={y|N}</replaceable> [<replaceable>guest_ok={y|N}</replaceable> [<replaceable>comment</replaceable>]]] </title>
+<title>CONF ADDSHARE <replaceable>sharename</replaceable> <replaceable>path</replaceable> [<replaceable>writable={y|N}</replaceable> [<replaceable>guest_ok={y|N}</replaceable> [<replaceable>comment</replaceable>]]] </title>
 
 <para>Create a new share definition in registry.
 The sharename and path have to be given. The share name may
 <emphasis>not</emphasis> be "global". Optionally, values for the very
-common options "writeable", "guest ok" and a "comment" may be specified.
+common options "writable", "guest ok" and a "comment" may be specified.
 The same result may be obtained by a sequence of "net conf setparm"
 commands.
 </para>
@@ -1702,7 +1702,7 @@ Joins a computer into a domain. This command supports the following additional p
 
 <listitem><para><replaceable>DOMAIN</replaceable> can be a NetBIOS domain name (also known as short domain name) or a DNS domain name for Active Directory Domains. As in Windows, it is also possible to control which Domain Controller to use. This can be achieved by appending the DC name using the \ separator character. Example: MYDOM\MYDC. The <replaceable>DOMAIN</replaceable> parameter cannot be NULL.</para></listitem>
 
-<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order to create the machine account in a non-default LDAP containter. This optional parameter is only supported when joining Active Directory Domains.</para></listitem>
+<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order to create the machine account in a non-default LDAP container. This optional parameter is only supported when joining Active Directory Domains.</para></listitem>
 
 <listitem><para><replaceable>ACCOUNT</replaceable> defines a domain account that will be used to join the machine to the domain. This domain account needs to have sufficient privileges to join machines.</para></listitem>
 
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 071e484..fc0ca83 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -54,7 +54,7 @@
     <filename>$LOCKDIR</filename>.  This should be done either by running
     this command as root or providing group access
     to the <filename>winbindd_privileged</filename> directory.  For
-    security reasons, this directory should not be world-accessable. </para>
+    security reasons, this directory should not be world-accessible. </para>
 
 </refsect1>
 
@@ -156,7 +156,7 @@
                 could cause the helper to authenticate the
                 user). </para>
 
-		<para>Curently implemented parameters from the
+		<para>Currently implemented parameters from the
 		external program to the helper are:</para>
 		<variablelist>
 		  <varlistentry>
@@ -199,7 +199,7 @@
                 MSCHAPv2) generated in some way by both the server and
                 the client.
                 </para>	
-		      <para><example>LANMAN-Challege: 0102030405060708</example></para>
+		      <para><example>LANMAN-Challenge: 0102030405060708</example></para>
 		    </listitem></varlistentry>
 
 		  <varlistentry>
@@ -239,7 +239,7 @@
 
 		  <varlistentry>
 		  <term>Request-User-Session-Key</term>
-                <listitem><para>Apon sucessful authenticaiton, return
+                <listitem><para>Upon successful authentication, return
                 the user session key associated with the login.
                  </para>	
 		      <para><example>Request-User-Session-Key: Yes</example></para>
@@ -248,15 +248,15 @@
 
 		  <varlistentry>
 		  <term>Request-LanMan-Session-Key</term>
-                <listitem><para>Apon sucessful authenticaiton, return
+                <listitem><para>Upon successful authentication, return
                 the LANMAN session key associated with the login.
                  </para>	
 		      <para><example>Request-LanMan-Session-Key: Yes</example></para>
 
 		    </listitem></varlistentry>
 
-		<para><warning>Implementors should take care to base64 encode
-		any data (such as usernames/passwords) that may contain malicous user data, such as
+		<para><warning>Implementers should take care to base64 encode
+		any data (such as usernames/passwords) that may contain malicious user data, such as
 		a newline.  They may also need to decode strings from
 		the helper, which likewise may have been base64 encoded.</warning></para>
 	</variablelist>
@@ -319,7 +319,7 @@
 
 	<varlistentry>
 	<term>--request-lm-key</term>
-	<listitem><para>Retreive LM session key</para></listitem>
+	<listitem><para>Retrieve LM session key</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
@@ -380,7 +380,7 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m
 	<title>TROUBLESHOOTING</title>
 	
 	<para>If you're experiencing problems with authenticating Internet Explorer running
-	under MS Windows 9X or Millenium Edition against ntlm_auth's NTLMSSP authentication
+	under MS Windows 9X or Millennium Edition against ntlm_auth's NTLMSSP authentication
 	helper (--helper-protocol=squid-2.5-ntlmssp), then please read 
 	<ulink url="http://support.microsoft.com/support/kb/articles/Q239/8/69.ASP">
 	the Microsoft Knowledge Base article #239869 and follow instructions described there</ulink>.
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index d139ff5..fa87e62 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -72,7 +72,7 @@
 	without changing the tool).</para>
 
 	<para>There are five main ways to use pdbedit: adding a user account,
-	removing a user account, modifing a user account, listing user
+	removing a user account, modifying a user account, listing user
 	accounts, importing users accounts.</para>
 </refsect1>
 
@@ -162,7 +162,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		<varlistentry>
 		<term>-f|--fullname fullname</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the user's full
+		modifying a user account. It will specify the user's full
 		name. </para>
 
 		<para>Example: <command>-f "Simo Sorce"</command></para>
@@ -172,7 +172,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		<varlistentry>
 		<term>-h|--homedir homedir</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the user's home
+		modifying a user account. It will specify the user's home
 		directory network path.</para>
 
 		<para>Example: <command>-h "\\\\BERSERKER\\sorce"</command>
@@ -183,7 +183,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		<varlistentry>
 		<term>-D|--drive drive</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the windows drive
+		modifying a user account. It will specify the windows drive
 		letter to be used to map the home directory.</para>
 
 		<para>Example: <command>-D "H:"</command>
@@ -195,7 +195,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		<varlistentry>
 		<term>-S|--script script</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the user's logon
+		modifying a user account. It will specify the user's logon
 		script path.</para>
 
 		<para>Example: <command>-S "\\\\BERSERKER\\netlogon\\sorce.bat"</command>
@@ -207,7 +207,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		<varlistentry>
 		<term>-p|--profile profile</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the user's profile
+		modifying a user account. It will specify the user's profile
 		directory.</para>
 
 		<para>Example: <command>-p "\\\\BERSERKER\\netlogon"</command>
@@ -447,7 +447,7 @@ account policy value for bad lockout attempt is now 3
 		<varlistentry>
 		<term>-N|--account-desc description</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the user's description
+		modifying a user account. It will specify the user's description
 		field.</para>
 
 		<para>Example: <command>-N "test description"</command>
@@ -458,7 +458,7 @@ account policy value for bad lockout attempt is now 3
 		<varlistentry>
 		<term>-Z|--logon-hours-reset</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will reset the user's allowed logon
+		modifying a user account. It will reset the user's allowed logon
 		hours. A user may login at any time afterwards.</para>
 
 		<para>Example: <command>-Z</command>
@@ -469,7 +469,7 @@ account policy value for bad lockout attempt is now 3
 		<varlistentry>
 		<term>-z|--bad-password-count-reset</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will reset the stored bad login
+		modifying a user account. It will reset the stored bad login
 		counter from a specified user.</para>
 
 		<para>Example: <command>-z</command>
@@ -490,7 +490,7 @@ account policy value for bad lockout attempt is now 3
 		<varlistentry>
 		<term>-I|--domain</term>
 		<listitem><para>This option can be used while adding or
-		modifing a user account. It will specify the user's domain field.</para>
+		modifying a user account. It will specify the user's domain field.</para>
 
 		<para>Example: <command>-I "MYDOMAIN"</command>
 		</para>
diff --git a/docs-xml/manpages-3/profiles.1.xml b/docs-xml/manpages-3/profiles.1.xml
index 77d5ac6..50ffb38 100644
--- a/docs-xml/manpages-3/profiles.1.xml
+++ b/docs-xml/manpages-3/profiles.1.xml
@@ -58,7 +58,7 @@
 
 		<varlistentry>
 		<term>-c SID1 -n SID2</term>
-		<listitem><para>Change all occurences of SID1 in <filename>file</filename> by SID2.
+		<listitem><para>Change all occurrences of SID1 in <filename>file</filename> by SID2.
 		</para></listitem>
 		</varlistentry>
 
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index 1f6187a..cb8f354 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -276,7 +276,7 @@ Comma Separated list of Files
 		<varlistentry><term>deldriverex &lt;driver&gt; [architecture] [version]
 		</term><listitem><para>Delete the specified printer driver including driver files. 
 		You can limit this action to a specific architecture and a specific version. 
-		If no architecure is given, all driver files of that driver will be deleted. 
+		If no architecture is given, all driver files of that driver will be deleted. 
 		</para></listitem></varlistentry>
 
 		<varlistentry><term>enumdata</term><listitem><para>Enumerate all 
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml
index f2deae5..807efbd 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages-3/samba.7.xml
@@ -216,7 +216,7 @@
 		<term><citerefentry><refentrytitle>profiles</refentrytitle>
 		<manvolnum>1</manvolnum></citerefentry></term>
 		<listitem><para><command>profiles</command> is a command-line
-		utility that can be used to replace all occurences of 
+		utility that can be used to replace all occurrences of 
 		a certain SID with another SID.
 		</para></listitem>
 		</varlistentry>
diff --git a/docs-xml/manpages-3/smb.conf.5.xml b/docs-xml/manpages-3/smb.conf.5.xml
index 48d7b57..4a4578f 100644
--- a/docs-xml/manpages-3/smb.conf.5.xml
+++ b/docs-xml/manpages-3/smb.conf.5.xml
@@ -258,7 +258,7 @@
 		</para>
 		
 		<para>
-		Typically the path specified is that of a world-writeable spool directory with the sticky bit set on 
+		Typically the path specified is that of a world-writable spool directory with the sticky bit set on 
 		it. A typical [printers] entry looks like this:
 <programlisting>
 <smbconfsection name="[printers]"/>
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index cadd2ea..e1e16e5 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -322,7 +322,7 @@
 		server support the UNIX extensions. Request that the connection be
 		encrypted. This is new for Samba 3.2 and will only work with Samba
 		3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses
-		the given credentials for the encryption negotiaion (either kerberos
+		the given credentials for the encryption negotiation (either kerberos
 		or NTLMv1/v2 if given domain/username/password triple. Fails the
 		connection if encryption cannot be negotiated.
 		</para></listitem>
@@ -428,7 +428,7 @@
 		<para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc 
 		(no password on share). </para>
 		
-		<para><command>smbclient //mypc/yshare "" -N -Tx backup.tar
+		<para><command>smbclient //mypc/myshare "" -N -Tx backup.tar
 		</command></para>
 		
 		<para>Restore everything except <filename>users/docs</filename>
@@ -469,8 +469,8 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-c|--comand command string</term>
-		<listitem><para>command string is a semicolon-separated list of 
+		<term>-c|--command command-string</term>
+		<listitem><para>command-string is a semicolon-separated list of 
 		commands to be executed instead of prompting from stdin. <parameter>
 		-N</parameter> is implied by <parameter>-c</parameter>.</para>
 
@@ -634,7 +634,7 @@
 
 		<varlistentry>
 		<term>du &lt;filename&gt;</term>
-		<listitem><para>Does a directory listing and then prints out the current disk useage and free space on a share.
+		<listitem><para>Does a directory listing and then prints out the current disk usage and free space on a share.
 		</para></listitem>
 		</varlistentry>
 
@@ -1096,12 +1096,12 @@
 	<para>It is recommended that the smbclient software be installed
 	in the <filename>/usr/local/samba/bin/</filename> or <filename>
 	/usr/samba/bin/</filename> directory, this directory readable 
-	by all, writeable only by root. The client program itself should 
+	by all, writable only by root. The client program itself should 
 	be executable by all. The client should <emphasis>NOT</emphasis> be 
 	setuid or setgid! </para>
 
 	<para>The client log files should be put in a directory readable 
-	and writeable only by the user. </para>
+	and writable only by the user. </para>
 
 	<para>To test the client, you will need to know the name of a 
 	running SMB/CIFS server. It is possible to run <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index c41dadc..d477721 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -214,7 +214,7 @@
 
 	<para>
 	Note that this message only sends notification that an
-	event has occured.  It doesn't actually cause the
+	event has occurred.  It doesn't actually cause the
 	event to happen.
 	</para>
 
diff --git a/docs-xml/manpages-3/smbcquotas.1.xml b/docs-xml/manpages-3/smbcquotas.1.xml
index 3bdd238..055ffc5 100644
--- a/docs-xml/manpages-3/smbcquotas.1.xml
+++ b/docs-xml/manpages-3/smbcquotas.1.xml
@@ -118,7 +118,7 @@
 
 
 <refsect1>
-	<title>QUOTA_SET_COMAND</title>
+	<title>QUOTA_SET_COMMAND</title>
 
 	<para>The format of an the QUOTA_SET_COMMAND is an operation
 	name followed by a set of parameters specific to that operation.
diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages-3/smbd.8.xml
index 87b9e28..f06ea0c 100644
--- a/docs-xml/manpages-3/smbd.8.xml
+++ b/docs-xml/manpages-3/smbd.8.xml
@@ -239,19 +239,19 @@
 	password), for account checking (is this account disabled?) and for
 	session management.  The degree too which samba supports PAM is restricted
 	by the limitations of the SMB protocol and the <smbconfoption name="obey pam restrictions"/> <citerefentry><refentrytitle>smb.conf</refentrytitle>
-	<manvolnum>5</manvolnum></citerefentry> paramater.  When this is set, the following restrictions apply:
+	<manvolnum>5</manvolnum></citerefentry> parameter.  When this is set, the following restrictions apply:
 	</para>
 
 	<itemizedlist>
 	<listitem><para><emphasis>Account Validation</emphasis>:  All accesses to a 
 	samba server are checked 
-	against PAM to see if the account is vaild, not disabled and is permitted to 
+	against PAM to see if the account is valid, not disabled and is permitted to 
 	login at this time.  This also applies to encrypted logins.
 	</para></listitem>
 
 	<listitem><para><emphasis>Session Management</emphasis>:  When not using share 
-	level secuirty, users must pass PAM's session checks before access 
-	is granted.  Note however, that this is bypassed in share level secuirty.  
+	level security, users must pass PAM's session checks before access 
+	is granted.  Note however, that this is bypassed in share level security.  
 	Note also that some older pam configuration files may need a line 
 	added for session support. 
 	</para></listitem>
diff --git a/docs-xml/manpages-3/smbget.1.xml b/docs-xml/manpages-3/smbget.1.xml
index 7170f46..0783f63 100644
--- a/docs-xml/manpages-3/smbget.1.xml
+++ b/docs-xml/manpages-3/smbget.1.xml
@@ -123,7 +123,7 @@
 
 	<varlistentry>
 		<term>-f, --rcfile</term>
-		<listitem><para>Use specified rcfile. This will be loaded in the order it was specified - e.g. if you specify any options before this one, they might get overriden by the contents of the rcfile.</para></listitem>
+		<listitem><para>Use specified rcfile. This will be loaded in the order it was specified - e.g. if you specify any options before this one, they might get overridden by the contents of the rcfile.</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
diff --git a/docs-xml/manpages-3/tdbbackup.8.xml b/docs-xml/manpages-3/tdbbackup.8.xml
index aaf46ac..336f267 100644
--- a/docs-xml/manpages-3/tdbbackup.8.xml
+++ b/docs-xml/manpages-3/tdbbackup.8.xml
@@ -54,7 +54,7 @@
 		<varlistentry>
 		<term>-s suffix</term>
 		<listitem><para>
-		The <command>-s</command> option allows the adminisistrator to specify a file
+		The <command>-s</command> option allows the administrator to specify a file
 		backup extension. This way it is possible to keep a history of tdb backup
 		files by using a new suffix for each backup.
 		</para> </listitem>
@@ -63,7 +63,7 @@
 		<varlistentry>
 		<term>-v</term>
 		<listitem><para>
-		The <command>-v</command> will check the database for damages (currupt data)
+		The <command>-v</command> will check the database for damages (corrupt data)
 		which if detected causes the backup to be restored.
 		</para></listitem>
 		</varlistentry>
diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages-3/testparm.1.xml
index 4e4eb2b..0e4d02e 100644
--- a/docs-xml/manpages-3/testparm.1.xml
+++ b/docs-xml/manpages-3/testparm.1.xml
@@ -101,7 +101,7 @@
 		Dumps the named parameter.  If no section-name is set the view
 		is limited by default to the global section.
 
-		It is also possible to dump a parametrical option.  Therfore
+		It is also possible to dump a parametrical option.  Therefore
 		the option has to be separated by a colon from the
 		parametername.
 		</para></listitem>
diff --git a/docs-xml/manpages-3/umount.cifs.8.xml b/docs-xml/manpages-3/umount.cifs.8.xml
index 319c437..acf7146 100644
--- a/docs-xml/manpages-3/umount.cifs.8.xml
+++ b/docs-xml/manpages-3/umount.cifs.8.xml
@@ -80,7 +80,7 @@ can rely on specifying explicit entries in /etc/fstab See</para>
 		<varlistentry>
                 <term>-l</term>
                 <listitem><para>Lazy unmount. Detach the filesystem from
-				the filesysetm hierarchy now, and
+				the filesystem hierarchy now, and
 				cleanup all references to the filesystem
 				as soon as it is not busy anymore.</para></listitem>
 		</varlistentry>
@@ -111,7 +111,7 @@ can rely on specifying explicit entries in /etc/fstab See</para>
 <refsect1>
 	<title>NOTES</title>
 	
-	<para>This command is normally intended to be installed setuid (since root users can already run unmount).  An alternative to using umount.cifs is to add specfic entries for the user mounts that you wish a particular user or users to mount and unmount to /etc/fstab</para>
+	<para>This command is normally intended to be installed setuid (since root users can already run unmount).  An alternative to using umount.cifs is to add specific entries for the user mounts that you wish a particular user or users to mount and unmount to /etc/fstab</para>
 </refsect1>
 
 <refsect1>
@@ -154,7 +154,7 @@ server type you are trying to contact.
 <refsect1>
 	<title>SEE ALSO</title>
 	<para>
-	Documentation/filesystems/cifs.txt and fs/cifs/README in the linux kernel
+	Documentation/filesystems/cifs.txt and fs/cifs/README in the Linux kernel
 	source tree may contain additional options and information.
 </para>
         <para><citerefentry><refentrytitle>mount.cifs</refentrytitle>
diff --git a/docs-xml/manpages-3/vfs_fake_perms.8.xml b/docs-xml/manpages-3/vfs_fake_perms.8.xml
index 282b11b..1191573 100644
--- a/docs-xml/manpages-3/vfs_fake_perms.8.xml
+++ b/docs-xml/manpages-3/vfs_fake_perms.8.xml
@@ -33,7 +33,7 @@
 	to allow Roaming Profile files and directories to be set (on
 	the Samba server under UNIX) as read only. This module will,
 	if installed on the Profiles share, report to the client that
-	the Profile files and directories are writeable. This satisfies
+	the Profile files and directories are writable. This satisfies
 	the client even though the files will never be overwritten as
 	the client logs out or shuts down.
 	</para>
diff --git a/docs-xml/manpages-3/vfs_readonly.8.xml b/docs-xml/manpages-3/vfs_readonly.8.xml
index d6f5721..3c70e6e 100644
--- a/docs-xml/manpages-3/vfs_readonly.8.xml
+++ b/docs-xml/manpages-3/vfs_readonly.8.xml
@@ -32,7 +32,7 @@
 	<para>The <command>vfs_readonly</command> VFS module marks a share
 	as read only for all clients connecting within the configured
 	time period. Clients connecting during this time will be denied
-	write access to all files in the share, irrespective of ther
+	write access to all files in the share, irrespective of their
 	actual access privileges.</para>
 
 	<para>This module is stackable.</para>
diff --git a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
index 4823a41..977ea66 100644
--- a/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
+++ b/docs-xml/manpages-3/vfs_shadow_copy2.8.xml
@@ -131,7 +131,7 @@
 <programlisting>
         <smbconfsection name="[homes]"/>
 	<smbconfoption name="vfs objects">shadow_copy2</smbconfoption>
-	<smbconfoption name="shadow:snapdir">/data/snaphots</smbconfoption>
+	<smbconfoption name="shadow:snapdir">/data/snapshots</smbconfoption>
 	<smbconfoption name="shadow:basedir">/data/home</smbconfoption>
 </programlisting>
 
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 76d3202..37b0831 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -48,7 +48,7 @@
 	</simplelist>
 
 	<para><command>vfs_smb_traffic_analyzer</command> sends the following data
-	in a fixed format seperated by a comma through either an internet or a
+	in a fixed format separated by a comma through either an internet or a
 	unix domain socket:</para>
 	<programlisting>
 	BYTES|USER|DOMAIN|READ/WRITE|SHARE|FILENAME|TIMESTAMP
@@ -61,9 +61,9 @@
 	<listitem><para><command>USER</command> - the user who initiated the operation</para></listitem>
 	<listitem><para><command>DOMAIN</command> - the domain of the user</para></listitem>
 	<listitem><para><command>READ/WRITE</command> - either "W" for a write operation or "R" for read</para></listitem>
-	<listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occured</para></listitem>
+	<listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occurred</para></listitem>
 	<listitem><para><command>FILENAME</command> - the name of the file that was used by the VFS operation</para></listitem>
-	<listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured</para></listitem>
+	<listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occurred</para></listitem>
 	</itemizedlist>
 
 	</para>
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index ba20c5e..8752f38 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -45,7 +45,7 @@
 	<para>Even if winbind is not used for nsswitch, it still provides a
 	service to <command>smbd</command>, <command>ntlm_auth</command>
 	and the <command>pam_winbind.so</command> PAM module, by managing connections to
-	domain controllers.  In this configuraiton the
+	domain controllers.  In this configuration the
 	<smbconfoption name="idmap uid"/> and
 	<smbconfoption name="idmap gid"/>
 	parameters are not required. (This is known as `netlogon proxy only mode'.)</para>
-- 
1.7.3