Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 0af6a15090c429d20879ddb4a6f4b4b9dbd1df39..919039db297ddf549e173226cd63e302adde71bd 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -91,7 +91,7 @@ o   Gerald (Jerry) Carter <jerry@samba.org>
 
 
 o   Glenn Curtis <gcurtis@likewisesoftware.com>
-    * Prevent cycle in Wibind's list of children when reaping dead processes.
+    * Prevent cycle in Winbind's list of children when reaping dead processes.
 
 
 o   Steven Danneman <steven.danneman@isilon.com>
@@ -139,7 +139,7 @@ o   Jim McDonough <jmcd@samba.org>
 
 
 o   Karolin Seeger <kseeger@samba.org>
-    * Documentation cleanup after r emerging docs from svn to git and 
+    * Documentation cleanup after merging docs from svn to git and 
       back-porting from the v3-2 branch.
 
 

diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index a52a4c25b0877f1390a7768cfdbb0bec17676bae..3da5991afcf67959c77b75bf26e20def15be4c8b 100644 (file)
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -45,15 +45,14 @@
        <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
-       <smbconfoption name="idmap uid"/> and
-       <smbconfoption name="idmap gid"/>
+       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>
 
-        <para> The Name Service Switch allows user
+        <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>
@@ -61,13 +60,12 @@
        <para>The service provided by <command>winbindd</command> is called `winbind' and
        can be used to resolve user and group information from a
        Windows NT server. The service can also provide authentication
-       services via an associated PAM module. </para>
+       services via an associated PAM module.</para>
 
        <para>
        The <filename>pam_winbind</filename> module supports the
         <parameter>auth</parameter>, <parameter>account</parameter>
-        and <parameter>password</parameter>
-        module-types.  It should be noted that the
+        and <parameter>password</parameter> module-types.  It should be noted that the
         <parameter>account</parameter> module simply performs a getpwnam() to verify that
         the system can obtain a uid for the user, as the domain
         controller has already performed access control.  If the
@@ -119,12 +117,17 @@
        resolve user and group information from <filename>/etc/passwd
        </filename> and <filename>/etc/group</filename> and then from the
        Windows NT server.
+       </para>
+
 <programlisting>
 passwd:         files winbind
 group:          files winbind
-## only available on IRIX; Linux users should us libnss_wins.so
-hosts:          files dns winbind
-</programlisting></para>
+## only available on IRIX: use winbind to resolve hosts:
+# hosts:        files dns winbind
+## All other NSS enabled systems should use libnss_wins.so like this:
+hosts:          files dns wins
+
+</programlisting>
 
        <para>The following simple configuration in the
        <filename>/etc/nsswitch.conf</filename> file can be used to initially