summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2010-04-13 20:06:14 +0200
committerKarolin Seeger <kseeger@samba.org>2010-05-06 14:08:35 +0200
commit07b4b577d49afcac9794187588e32189429e04ed (patch)
treea52b149db8724e9301e6dfa769a9dda15dcd537e
parent56454403033a8d5ae97ab9a19567dd380759750a (diff)
downloadsamba-07b4b577d49afcac9794187588e32189429e04ed.tar.gz
s3-docs: Fix typo in man idmap_ad.
Karolin (cherry picked from commit 6389fac6db2f54d148222009b5e209cef5c6bdd7) (cherry picked from commit 39dbf73a6fb4ad45eac259124b70042994d4f215) (cherry picked from commit 1038d91f3c6d2be0a594226059c5379d3e2ffe58)
-rw-r--r--docs-xml/manpages-3/idmap_ad.8.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index 0fd0ed6d1a1..58f687895e7 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -58,7 +58,7 @@
<title>EXAMPLES</title>
<para>
The following example shows how to retrieve idmappings from our principal and
- and trusted AD domains. If trusted domains are present id conflicts must be
+ 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.