From: John H Terpstra <jht@samba.org>
Date: Mon, 19 May 2008 18:00:01 +0000 (-0500)
Subject: Clarification that hosts resolution is done by winbind only on IRIX, all other system... 
X-Git-Tag: samba-3.3.0pre1~815
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5144c1b2d6891ecf5d21a0b3982276bdbcf27960;p=thirdparty%2Fsamba.git

Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
(cherry picked from commit 2a953d6ba252e5ba4e28b7fae5979e7c47fe9bd0)
(cherry picked from commit 59bb2b0c9a6397bb0202055d7b00dce30d7bf03b)
---

diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 8e981fd1022..5bc1255d25c 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.0</refmiscinfo>
 </refmeta>
 
 
@@ -119,12 +119,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
@@ -470,7 +475,7 @@ auth  required    /lib/security/pam_unix.so \
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3 of
+	<para>This man page is correct for version 3.0 of
         the Samba suite.</para>
 </refsect1>