Changeset 480 for trunk/server/docs/manpages/idmap_ad.8

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• docs/manpages/idmap_ad.8 (modified) (2 diffs)

trunk/server/docs/manpages/idmap_ad.8

@@ -2 +2 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\"      Date: 03/30/2010
+.\"      Date: 0/2010
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "03/30/2010" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_AD" "8" "0/2010" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * (re)Define some macros
@@ -185 +185 @@
 .SH "EXAMPLES"
 .PP
-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 resolved beforehand, there is no 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 BUILTIN\&.
+The following example shows how to retrieve idmappings from our principal and 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\&. This example also shows how to leave a small non conflicting range for local id allocation that may be used in internal backends like BUILTIN\&.
 .sp
 .if n \{\