[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-29-90-g4fac700
Karolin Seeger
kseeger at samba.org
Wed Jul 16 08:18:14 GMT 2008
The branch, v3-0-test has been updated
via 4fac700a40f13210fa0849244e1427527d77f338 (commit)
from df7d320092e17829addeded29d660b0ca9e60aa1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 4fac700a40f13210fa0849244e1427527d77f338
Author: Christoph Zauner <christoph.zauner at sernet.de>
Date: Fri Jul 11 15:50:25 2008 +0200
man pages: Fix typos and add improvements.
(cherry picked from commit 060ff6d8d4e61f3ce89f980182413852cc5719be)
(cherry picked from commit dab5cf616ce044040dd598fec3da9d3c97e51f6d)
(cherry picked from commit 253405062237edfa78dc669a275af7ce9db849c4)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/winbind/idmapbackend.xml | 4 ++--
docs-xml/smbdotconf/winbind/idmapconfig.xml | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/winbind/idmapbackend.xml b/docs-xml/smbdotconf/winbind/idmapbackend.xml
index 20e1115..10c4cb3 100644
--- a/docs-xml/smbdotconf/winbind/idmapbackend.xml
+++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml
@@ -8,9 +8,9 @@
The idmap backend provides a plugin interface for Winbind to use
varying backends to store SID/uid/gid mapping tables. This
option is mutually exclusive with the newer and more flexible
- <smbconfoption name="idmap domains"/> parameter. The main difference
+ <smbconfoption name="idmap domains"/> parameter. The main difference
between the "idmap backend" and the "idmap domains"
- is that the former only allows on backend for all domains while the
+ is that the former only allows one backend for all domains while the
latter supports configuring backends on a per domain basis.
</para>
diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 63b0a90..08297d7 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -7,9 +7,9 @@
<para>
The idmap config prefix provides a means of managing each domain
defined by the <smbconfoption name="idmap domains"/> option using Samba's
- parameteric option support. The idmap config prefix should be
+ parametric option support. The idmap config prefix should be
followed by the name of the domain, a colon, and a setting specific to
- the chosen backend. There are three options available for all domains:
+ the chosen backend. There are three options available for all domains:
</para>
<variablelist>
<varlistentry>
@@ -45,9 +45,10 @@
The following example illustrates how to configure the <citerefentry>
<refentrytitle>idmap_ad</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for the CORP domain and the <citerefentry><refentrytitle>idmap_tdb</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> backend for all other domains. The
- TRUSTEDDOMAINS string is simply a key used to reference the "idmap
+ <manvolnum>8</manvolnum></citerefentry> backend for all other domains. The
+ TRUSTEDDOMAINS string is simply an arbitrary key used to reference the "idmap
config" settings and does not represent the actual name of a domain.
+ It is a catchall domain backend for any domain not explicitly listed.
</para>
<programlisting>
--
Samba Shared Repository
More information about the samba-cvs
mailing list