summaryrefslogtreecommitdiff
path: root/docs-xml/manpages-3/idmap_ad.8.xml
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-16 15:36:53 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-16 15:36:53 +0100
commita7109b183b555ee795c3e32c63e2647025705fc1 (patch)
treebc118e6f1dd72466367a4aa9b31df08f253eaa07 /docs-xml/manpages-3/idmap_ad.8.xml
parent0f04beff337a936a66c86272ff79defd9e8ae173 (diff)
parent9e64ed018e5aa84d802b01953b481fbb07eb00aa (diff)
downloadsamba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.gz
samba-a7109b183b555ee795c3e32c63e2647025705fc1.tar.bz2
samba-a7109b183b555ee795c3e32c63e2647025705fc1.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml/manpages-3/idmap_ad.8.xml')
-rw-r--r--docs-xml/manpages-3/idmap_ad.8.xml12
1 files changed, 6 insertions, 6 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 &quot;idmap&quot;
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