From 07b4b577d49afcac9794187588e32189429e04ed Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Tue, 13 Apr 2010 20:06:14 +0200 Subject: [PATCH] s3-docs: Fix typo in man idmap_ad. Karolin (cherry picked from commit 6389fac6db2f54d148222009b5e209cef5c6bdd7) (cherry picked from commit 39dbf73a6fb4ad45eac259124b70042994d4f215) (cherry picked from commit 1038d91f3c6d2be0a594226059c5379d3e2ffe58) --- docs-xml/manpages-3/idmap_ad.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ EXAMPLES 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. -- 2.11.4.GIT