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-17 09:50:11 +0200
commit2862e0e5b316348d9ca942f855949022b9bb4fc3 (patch)
tree3f23841cf2b0677716fa1cbbae72c8e45d014110
parent1915731be9d04af662bd51b2ee79f3a2bcfac0c8 (diff)
downloadsamba-2862e0e5b316348d9ca942f855949022b9bb4fc3.tar.gz
s3-docs: Fix typo in man idmap_ad.
Karolin (cherry picked from commit 6389fac6db2f54d148222009b5e209cef5c6bdd7) (cherry picked from commit 39dbf73a6fb4ad45eac259124b70042994d4f215)
-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 01e059ada83..4ca107fd9a7 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.