diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-12-17 07:17:54 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-12-17 07:17:54 +1100 |
| commit | 1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3 (patch) | |
| tree | cee337a9c93890605fb12490faec2a7f0b2188d8 /docs-xml | |
| parent | e294c4799bf6ad8da043aadf8341391644147056 (diff) | |
| parent | 54dc421f5820099531a77879f52a904c2fefcf49 (diff) | |
| download | samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.tar.gz samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.tar.bz2 samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/manpages-3/idmap_ad.8.xml | 12 | ||||
| -rw-r--r-- | docs-xml/manpages-3/tdbtool.8.xml | 8 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/vfs/aclcompatibility.xml | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml index fb0792eb9e..9437d34000 100644 --- a/docs-xml/manpages-3/idmap_ad.8.xml +++ b/docs-xml/manpages-3/idmap_ad.8.xml @@ -23,8 +23,8 @@ extensions. This module implements only the "idmap" API, and is READONLY. Mappings must be provided in advance by the administrator by adding the posixAccount/posixGroup - classess and relative attribute/value pairs to the users and - groups objects in AD</para> + classes and relative attribute/value pairs to the user and + group objects in the AD.</para> </refsynopsisdiv> <refsect1> @@ -34,7 +34,7 @@ <varlistentry> <term>range = low - high</term> <listitem><para> - Defines the available matching uid and gid range for which the + Defines the available matching UID and GID range for which the backend is authoritative. Note that the range acts as a filter. If specified any UID or GID stored in AD that fall outside the range is ignored and the corresponding map is discarded. @@ -47,7 +47,7 @@ <listitem><para> Defines the schema that idmap_ad should use when querying Active Directory regarding user and group information. - This can either the RFC2307 schema support included + This can be either the RFC2307 schema support included in Windows 2003 R2 or the Service for Unix (SFU) schema. </para></listitem> </varlistentry> @@ -58,8 +58,8 @@ <title>EXAMPLES</title> <para> The following example shows how to retrieve idmappings from our principal and - and trusted AD domains. All is needed is to set default to yes. If trusted - domains are present id conflicts must be resolved beforehand, there is no + and trusted AD domains. If trusted domains are present id conflicts must be + resolved beforehand, there is no guarantee on the order conflicting mappings would be resolved at this point. This example also shows how to leave a small non conflicting range for local diff --git a/docs-xml/manpages-3/tdbtool.8.xml b/docs-xml/manpages-3/tdbtool.8.xml index 3f5dec4ecd..c75059b957 100644 --- a/docs-xml/manpages-3/tdbtool.8.xml +++ b/docs-xml/manpages-3/tdbtool.8.xml @@ -193,6 +193,14 @@ <varlistentry> <term> + <option>check</option> + </term> + <listitem><para>Check the integrity of the current database. + </para></listitem> + </varlistentry> + + <varlistentry> + <term> <option>quit</option> </term> <listitem><para>Exit <command>tdbtool</command>. diff --git a/docs-xml/smbdotconf/vfs/aclcompatibility.xml b/docs-xml/smbdotconf/vfs/aclcompatibility.xml index 7891adc13b..95f42cfe2a 100644 --- a/docs-xml/smbdotconf/vfs/aclcompatibility.xml +++ b/docs-xml/smbdotconf/vfs/aclcompatibility.xml @@ -1,5 +1,5 @@ <samba:parameter name="acl compatibility" - context="S" + context="G" type="enum" advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> |