Changed "winbind uid/gid" to "idmap uid/gid"

(This used to be commit d205dd963bb306935d3c02c94684fa1143436158)

diff --git a/docs/docbook/manpages/wbinfo.1.xml b/docs/docbook/manpages/wbinfo.1.xml
index 075ce140ccb374eee097caf41de16784cb384bfe..5fd04c73655a06533a5daaa3f34120abd8d82a59 100644 (file)
--- a/docs/docbook/manpages/wbinfo.1.xml
+++ b/docs/docbook/manpages/wbinfo.1.xml
@@ -134,7 +134,7 @@
                <term>-U uid</term>
                <listitem><para>Try to convert a UNIX user id to a Windows NT 
                SID.  If the uid specified does not refer to one within
-               the winbind uid range then the operation will fail. </para></listitem>
+               the idmap uid range then the operation will fail. </para></listitem>
                </varlistentry>
 
 
@@ -142,7 +142,7 @@
                <term>-G gid</term>
                <listitem><para>Try to convert a UNIX group id to a Windows 
                NT SID.  If the gid specified does not refer to one within 
-               the winbind gid range then the operation will fail. </para></listitem>
+               the idmap gid range then the operation will fail. </para></listitem>
                </varlistentry>
                
                

diff --git a/docs/docbook/manpages/winbindd.8.xml b/docs/docbook/manpages/winbindd.8.xml
index d41620b707a0281ddf2452cd00876361163098bb..202354e2e9d9c302322b162825d4de2c2844f16c 100644 (file)
--- a/docs/docbook/manpages/winbindd.8.xml
+++ b/docs/docbook/manpages/winbindd.8.xml
@@ -210,9 +210,9 @@ group:          files winbind
                <listitem><para><ulink url="smb.conf.5.html#WINBINDSEPARATOR">
                <parameter>winbind separator</parameter></ulink></para></listitem>
                <listitem><para><ulink url="smb.conf.5.html#WINBINDUID">
-               <parameter>winbind uid</parameter></ulink></para></listitem>
+               <parameter>idmap uid</parameter></ulink></para></listitem>
                <listitem><para><ulink url="smb.conf.5.html#WINBINDGID">
-               <parameter>winbind gid</parameter></ulink></para></listitem>
+               <parameter>idmap gid</parameter></ulink></para></listitem>
                <listitem><para><ulink url="smb.conf.5.html#WINBINDCACHETIME">
                <parameter>winbind cache time</parameter></ulink></para></listitem>
                <listitem><para><ulink url="smb.conf.5.html#WINBINDENUMUSERS">
@@ -287,8 +287,8 @@ auth       required     /lib/security/pam_pwdb.so use_first_pass shadow nullok
         winbind cache time = 10
         template shell = /bin/bash
         template homedir = /home/%D/%U
-        winbind uid = 10000-20000
-        winbind gid = 10000-20000
+        idmap uid = 10000-20000
+        idmap gid = 10000-20000
         workgroup = DOMAIN
         security = domain
         password server = *