The branch, v3-4-test has been updated
via 1038d91... s3-docs: Fix typo in man idmap_ad.
from be86206... s3:lib/time: remove TIME_T_MIN/MAX defines
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 1038d91f3c6d2be0a594226059c5379d3e2ffe58
Author: Karolin Seeger <ksee...@samba.org>
Date: Tue Apr 13 20:06:14 2010 +0200
s3-docs: Fix typo in man idmap_ad.
Karolin
(cherry picked from commit 6389fac6db2f54d148222009b5e209cef5c6bdd7)
(cherry picked from commit 39dbf73a6fb4ad45eac259124b70042994d4f215)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/idmap_ad.8.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml
b/docs-xml/manpages-3/idmap_ad.8.xml
index 0fd0ed6..58f6878 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.
--
Samba Shared Repository
