X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=docs-xml%2Fmanpages-3%2Fwinbindd.8.xml;h=5bc1255d25ca771782678c88298c9b7a846ef742;hp=7e3948c461d4d6b0c8e97df64c7088b2bc4866b5;hb=551b737f9bed8ecc764290d007fcba74109a6c24;hpb=8f8a9f01909ba29e2b781310baeeaaddc3f15f0d

diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 7e3948c461d..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
@@ -225,9 +230,7 @@ hosts:		files wins
 	determine which user and group ids correspond to Windows NT user
 	and group rids. </para>
 
-        <para>See the <smbconfoption><name>idmap
-        domains</name></smbconfoption> or the old <smbconfoption><name>idmap
-	backend</name></smbconfoption> parameters in
+        <para>See the <smbconfoption name="idmap domains"/> or the old <smbconfoption name="idmap backend"/> parameters in
         <filename>smb.conf</filename> for options for sharing this
         database, such as via LDAP.</para>
 </refsect1>
@@ -374,8 +377,7 @@ auth  required    /lib/security/pam_unix.so \
 	<para>If more than one UNIX machine is running <command>winbindd</command>,
 	then in general the user and groups ids allocated by winbindd will not
 	be the same.  The user and group ids will only be valid for the local
-	machine, unless a shared <smbconfoption><name>idmap
-	backend</name></smbconfoption> is configured.</para>
+	machine, unless a shared <smbconfoption name="idmap backend"/> is configured.</para>
 
 	<para>If the the Windows NT SID to UNIX user and group id mapping
 	file is damaged or destroyed then the mappings will be lost. </para>