git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5645440
)
s3-docs: Fix typo in man idmap_ad.
author
Karolin Seeger
<kseeger@samba.org>
Tue, 13 Apr 2010 18:06:14 +0000
(20:06 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Thu, 6 May 2010 12:08:35 +0000
(14:08 +0200)
Karolin
(cherry picked from commit
6389fac6db2f54d148222009b5e209cef5c6bdd7
)
(cherry picked from commit
39dbf73a6fb4ad45eac259124b70042994d4f215
)
(cherry picked from commit
1038d91f3c6d2be0a594226059c5379d3e2ffe58
)
docs-xml/manpages-3/idmap_ad.8.xml
patch
|
blob
|
history
diff --git
a/docs-xml/manpages-3/idmap_ad.8.xml
b/docs-xml/manpages-3/idmap_ad.8.xml
index 0fd0ed6d1a1ab4c2ea2742b36c3dab14c273498b..58f687895e708ed11b189fab9c20918d13604322 100644
(file)
--- 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.