Merge branch 'master' of git://git.samba.org/samba

3 files changed, 9 insertions, 9 deletions

diff --git a/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
index 846145ed58..625cfed219 100644
--- a/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
+++ b/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
@@ -489,8 +489,8 @@ Users (S-1-5-32-545) -> -1
 <screen>
 &rootprompt; mkdir -p /data/{accounts,finsvcs}
 &rootprompt; chown -R root:root /data
-&rootprompt; chown -R alanm:accounts /data/accounts
-&rootprompt; chown -R alanm:finsvcs /data/finsvcs
+&rootprompt; chown -R alanm:acctsdep /data/accounts
+&rootprompt; chown -R alanm:finsrvcs /data/finsrvcs
 &rootprompt; chmod -R ug+rwx,o+rx-w /data
 </screen>
 		Each department is responsible for creating its own directory structure within its
@@ -688,9 +688,9 @@ hosts:	files wins
 <smbconfoption name="valid users">%G</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
-<smbconfsection name="[finsvcs]"/>
+<smbconfsection name="[finsrvcs]"/>
 <smbconfoption name="comment">Financial Service Files</smbconfoption>
-<smbconfoption name="path">/data/finsvcs</smbconfoption>
+<smbconfoption name="path">/data/finsrvcs</smbconfoption>
 <smbconfoption name="valid users">%G</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 </smbconfblock>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
index 4781994881..f590334ebe 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
@@ -36,7 +36,7 @@ This is followed by an overview of how the IDMAP facility may be implemented.
 The IDMAP facility is of concern where more than one Samba server (or Samba network client)
 is installed in a domain. Where there is a single Samba server, do not be too concerned regarding
 the IDMAP infrastructure &smbmdash; the default behavior of Samba is nearly always sufficient.
-Where mulitple Samba servers are used it is often necessary to move data off one server and onto
+Where multiple Samba servers are used it is often necessary to move data off one server and onto
 another, and that is where the fun begins!
 </para>
 
@@ -426,7 +426,7 @@ on Server Types and Security Modes</link>.
 	<indexterm><primary>passdb backend</primary></indexterm>
 	<indexterm><primary>BDC</primary></indexterm>
 	<indexterm><primary>LDAP backend</primary></indexterm>
-	Security identifiers used within a domain must be managed to avoid conflict and to preserve itegrity.
+	Security identifiers used within a domain must be managed to avoid conflict and to preserve integrity.
 	In an NT4 domain context, the PDC manages the distribution of all security credentials to the backup
 	domain controllers (BDCs). At this time the only passdb backend for a Samba domain controller that is suitable
 	for such information is an LDAP backend.
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
index ea0ed485c0..6e96ad1e1a 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
@@ -634,7 +634,7 @@ exit 0
 
 		<step><para>
 		Modify the &smb.conf; file so the <literal>NETLOGON</literal> stanza contains the parameters
-		shown in <link linkend="magicnetlogon">the Netlogon Example smb.conf file</link>.
+		shown in <link linkend="magicnetlogon">the Netlogon Example smb.conf file</link> as shown.
 		</para></step>
 
 <example id="magicnetlogon">
@@ -1303,7 +1303,7 @@ Storing SID S-1-5-21-726309263-4128913605-1168186429 \
 	that the addition and deletion of shares using this tool depends on the availability of a suitable
 	interface script. The interface scripts Sambas <command>smbd</command> uses are called
 	<smbconfoption name="add share command"/>, <smbconfoption name="delete share command"/> and
-	<smbconfoption name="change share command"/> A set of example scripts are provided in the Samba source
+	<smbconfoption name="change share command"/>. A set of example scripts are provided in the Samba source
 	code tarball in the directory <filename>~samba/examples/scripts</filename>.
 	</para>
 
@@ -1630,7 +1630,7 @@ net rpc share MIGRATE ALL &lt;share-name&gt; -S &lt;source&gt;
 	Printing needs vary greatly depending on the network environment and may be very simple or complex. If
 	the need is very simple, the best solution to the implementation of printing support may well be to
 	re-install everything from a clean slate instead of migrating older configurations. On the other hand,
-	a complex network that is integrated with many international offices and a multiplexity of local branch
+	a complex network that is integrated with many international offices and a complex arrangement of local branch
 	offices, each of which form an inter-twined maze of printing possibilities, the ability to migrate all
 	printer configurations is decidedly beneficial. To manually re-establish a complex printing network
 	will take much time and frustration. Often it will not be possible to find driver files that are