summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-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.