summaryrefslogtreecommitdiff
path: root/docs/manpages-3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-09-12 12:16:36 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:37 -0500
commit4fb800c804dbc906933234ffae843326c98c913f (patch)
treeddef068a58d66d5590ae21348137fadfd688de61 /docs/manpages-3
parentd675338a10b12167cbf9fe93d913f20ba6f4caa5 (diff)
downloadsamba-4fb800c804dbc906933234ffae843326c98c913f.tar.gz
samba-4fb800c804dbc906933234ffae843326c98c913f.tar.bz2
samba-4fb800c804dbc906933234ffae843326c98c913f.zip
Fix typo
(This used to be commit a60dafe1ce041e60c8a6fd22b3c2dc9fb5ab2a84)
Diffstat (limited to 'docs/manpages-3')
-rw-r--r--docs/manpages-3/idmap_ad.8.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/manpages-3/idmap_ad.8.xml b/docs/manpages-3/idmap_ad.8.xml
index b7541376ed..0def787171 100644
--- a/docs/manpages-3/idmap_ad.8.xml
+++ b/docs/manpages-3/idmap_ad.8.xml
@@ -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.