Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server

  • trunk/server/docs-xml/manpages-3/idmap_ad.8.xml

    r414 r480  
    5959        <para>
    6060        The following example shows how to retrieve idmappings from our principal and
    61         and trusted AD domains. If trusted domains are present id conflicts must be
     61        trusted AD domains. If trusted domains are present id conflicts must be
    6262        resolved beforehand, there is no
    6363        guarantee on the order conflicting mappings would be resolved at this point.
Note: See TracChangeset for help on using the changeset viewer.