summaryrefslogtreecommitdiff
path: root/docs/docbook/smbdotconf/winbind
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-07-16 05:34:56 +0000
committerGerald Carter <jerry@samba.org>2003-07-16 05:34:56 +0000
commit4a090ba06a54f5da179ac02bb307cc03d08831bf (patch)
treeed652ef36be7f16682c358816334f969a22f1c27 /docs/docbook/smbdotconf/winbind
parent95fe82670032a3a43571b46d7bbf2c26bc8cdcd9 (diff)
downloadsamba-4a090ba06a54f5da179ac02bb307cc03d08831bf.tar.gz
samba-4a090ba06a54f5da179ac02bb307cc03d08831bf.tar.bz2
samba-4a090ba06a54f5da179ac02bb307cc03d08831bf.zip
trying to get HEAD building again. If you want the code
prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE (This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)
Diffstat (limited to 'docs/docbook/smbdotconf/winbind')
-rw-r--r--docs/docbook/smbdotconf/winbind/winbindgid.xml2
-rw-r--r--docs/docbook/smbdotconf/winbind/winbinduid.xml11
-rw-r--r--docs/docbook/smbdotconf/winbind/winbindusedefaultdomain.xml2
3 files changed, 9 insertions, 6 deletions
diff --git a/docs/docbook/smbdotconf/winbind/winbindgid.xml b/docs/docbook/smbdotconf/winbind/winbindgid.xml
index a8414e9e8c..e00e576389 100644
--- a/docs/docbook/smbdotconf/winbind/winbindgid.xml
+++ b/docs/docbook/smbdotconf/winbind/winbindgid.xml
@@ -3,6 +3,8 @@
advanced="1" developer="1" hide="1"
xmlns:samba="http://samba.org/common">
<listitem>
+ <para>This parameter is now an alias for <command moreinfo="none">idmap gid</command></para>
+
<para>The winbind gid parameter specifies the range of group
ids that are allocated by the <citerefentry><refentrytitle>winbindd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> daemon. This range of group ids should have no
diff --git a/docs/docbook/smbdotconf/winbind/winbinduid.xml b/docs/docbook/smbdotconf/winbind/winbinduid.xml
index 6fee40fcb8..0f61bac13c 100644
--- a/docs/docbook/smbdotconf/winbind/winbinduid.xml
+++ b/docs/docbook/smbdotconf/winbind/winbinduid.xml
@@ -3,11 +3,12 @@
advanced="1" developer="1" hide="1"
xmlns:samba="http://samba.org/common">
<listitem>
- <para>The winbind gid parameter specifies the range of group
- ids that are allocated by the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon. This range of ids should have no
- existing local or NIS users within it as strange conflicts can
- occur otherwise.</para>
+ <para>This parameter is now an alias for <command moreinfo="none">idmap uid</command></para>
+
+ <para>The winbind gid parameter specifies the range of user ids that are allocated by the
+ <citerefentry><refentrytitle>winbindd</refentrytitle> <manvolnum>8</manvolnum></citerefentry>
+ daemon. This range of ids should have no existing local or NIS users within it as strange
+ conflicts can occur otherwise.</para>
<para>Default: <command moreinfo="none">winbind uid = &lt;empty string&gt;</command></para>
diff --git a/docs/docbook/smbdotconf/winbind/winbindusedefaultdomain.xml b/docs/docbook/smbdotconf/winbind/winbindusedefaultdomain.xml
index 5c31a7f9b0..8112331f5e 100644
--- a/docs/docbook/smbdotconf/winbind/winbindusedefaultdomain.xml
+++ b/docs/docbook/smbdotconf/winbind/winbindusedefaultdomain.xml
@@ -1,4 +1,4 @@
-<samba:parameter name="winbind used default domain"
+<samba:parameter name="winbind use default domain"
context="G"
advanced="1" developer="1"
xmlns:samba="http://samba.org/common">