svn commit: samba-docs r1181 - in trunk/manpages-3: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-09-12 12:16:36 +0000 (Wed, 12 Sep 2007)
New Revision: 1181

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1181

Log:
Fix typo
Modified:
   trunk/manpages-3/idmap_ad.8.xml


Changeset:
Modified: trunk/manpages-3/idmap_ad.8.xml
===================================================================
--- trunk/manpages-3/idmap_ad.8.xml	2007-09-12 11:56:02 UTC (rev 1180)
+++ trunk/manpages-3/idmap_ad.8.xml	2007-09-12 12:16:36 UTC (rev 1181)
@@ -57,7 +57,7 @@
 	The following example shows how to retrieve idmappings from our principal and
 	and trusted AD domains. All is needed is to set default to yes. If trusted
 	domains are present id conflicts must be resolved beforehand, there is no
-	guarantee on the order confliting mappings would be resolved at this point.
+	guarantee on the order conflicting mappings would be resolved at this point.
 
 	This example also shows how to leave a small non conflicting range for local
 	id allocation that may be used in internal backends like BULTIN.