[SCM] Samba Shared Repository - branch v3-4-test updated

Karolin Seeger kseeger at samba.org
Wed Jan 20 05:38:47 MST 2010

The branch, v3-4-test has been updated
       via  436e136... s3-docs: Fix typos.
      from  20a4052... s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value.


- Log -----------------------------------------------------------------
commit 436e13608e489b4bd5c00597efca9c9ca66b8be1
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jan 20 13:34:50 2010 +0100

    s3-docs: Fix typos.
    Thanks to the Debian samba package maintainers
    <pkg-samba-maint at lists.alioth.debian.org> for providing the patch!
    Fix bug #7017 (Typos and spelling errors in manpages).
    (cherry picked from commit e1e6b19acff6d8ba3b70c3ab474a85de8b6f6a6c)
    (cherry picked from commit eaa10cfec3c389c79ac3c43f7ec1596015a9b8e1)


Summary of changes:
 docs-xml/manpages-3/ntlm_auth.1.xml                |    2 +-
 docs-xml/manpages-3/smbd.8.xml                     |    2 +-
 docs-xml/manpages-3/winbindd.8.xml                 |    2 +-
 docs-xml/smbdotconf/browse/preferredmaster.xml     |    2 +-
 docs-xml/smbdotconf/protocol/largereadwrite.xml    |    2 +-
 .../smbdotconf/winbind/winbindnormalizenames.xml   |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 8675582..edd1e11 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -35,7 +35,7 @@
 	users using NT/LM authentication. It returns 0 if the users is authenticated
 	successfully and 1 if access was denied. ntlm_auth uses winbind to access 
 	the user and authentication data for a domain.  This utility 
-	is only indended to be used by other programs (currently
+	is only intended to be used by other programs (currently
 	<ulink url="http://www.squid-cache.org/">Squid</ulink>
 	and <ulink url="http://download.samba.org/ftp/unpacked/lorikeet/trunk/mod_ntlm_winbind/">mod_ntlm_winbind</ulink>)
diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages-3/smbd.8.xml
index 67ec6a1..b0508fa 100644
--- a/docs-xml/manpages-3/smbd.8.xml
+++ b/docs-xml/manpages-3/smbd.8.xml
@@ -120,7 +120,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. <command>smbd</command> also logs to standard
 		output, as if the <command>-S</command> parameter had been
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index c681da8..b1e3465 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -53,7 +53,7 @@
         <para> The Name Service Switch allows user
 	and system information to be obtained from different databases
 	services such as NIS or DNS.  The exact behaviour can be configured
-	throught the <filename>/etc/nsswitch.conf</filename> file.
+	through the <filename>/etc/nsswitch.conf</filename> file.
 	Users and groups are allocated as they are resolved to a range
 	of user and group ids specified by the administrator of the
 	Samba system.</para>
diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index edddae8..9dcffb4 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -16,7 +16,7 @@
 	parameter is used in conjunction with <smbconfoption name="domain master">yes</smbconfoption>, so that
 	<command moreinfo="none">nmbd</command> can guarantee becoming a domain master.
 	Use this option with caution, because if there are several hosts (whether Samba servers, Windows 95 or NT)
 	that are preferred  master browsers on the same subnet, they will each periodically  and continuously attempt
diff --git a/docs-xml/smbdotconf/protocol/largereadwrite.xml b/docs-xml/smbdotconf/protocol/largereadwrite.xml
index 12be741..0b4158d 100644
--- a/docs-xml/smbdotconf/protocol/largereadwrite.xml
+++ b/docs-xml/smbdotconf/protocol/largereadwrite.xml
@@ -7,7 +7,7 @@
     <para>This parameter determines whether or not
     <manvolnum>8</manvolnum></citerefentry> supports the new 64k
-    streaming read and write varient SMB requests introduced with
+    streaming read and write variant SMB requests introduced with
     Windows 2000. Note that due to Windows 2000 client redirector bugs
     this requires Samba to be running on a 64-bit capable operating
     system such as IRIX, Solaris or a Linux 2.4 kernel. Can improve
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index ba71686..3bcdeca 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -20,7 +20,7 @@
 	  version.  Please refer to the manpage for the configured
 	  idmap and nss_info plugin for the specifics on how to configure
 	  name aliasing for a specific configuration.  Name aliasing takes
-	  precendence (and is mutually exclusive) over the whitespace
+	  precedence (and is mutually exclusive) over the whitespace
 	  replacement mechanism discussed previsouly.

Samba Shared Repository

More information about the samba-cvs mailing list