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

[jmcd at samba.org]

Author: jmcd
Date: 2006-12-12 16:52:26 +0000 (Tue, 12 Dec 2006)
New Revision: 1003

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

Log:
Add ads-only options for net ads join

Modified:
   trunk/manpages-3/net.8.xml


Changeset:
Modified: trunk/manpages-3/net.8.xml
===================================================================
--- trunk/manpages-3/net.8.xml	2006-12-01 13:53:26 UTC (rev 1002)
+++ trunk/manpages-3/net.8.xml	2006-12-12 16:52:26 UTC (rev 1003)
@@ -181,7 +181,7 @@
 </refsect2>
 
 <refsect2>
-<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [options]</title>
+<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN] [createcomputer=OU] [options]</title>
 
 <para>
 Join a domain.  If the account already exists on the server, and 
@@ -194,6 +194,19 @@
 [TYPE] may be PDC, BDC or MEMBER to specify the type of server
 joining the domain.
 </para>
+
+<para>
+[UPN] (ADS only) set the principalname attribute during the join.  The default
+format is host/netbiosname at REALM.
+</para>
+
+<para>
+[OU] (ADS only) Precreate the computer account in a specific OU.  The
+OU string reads from top to bottom without RDNs, and is delimited by
+a '/'.  Please note that '\' is used for escape by both the shell
+and ldap, so it may need to be doubled or quadrupled to pass through, 
+and it is not used as a delimiter.
+</para>
 </refsect2>
 
 <refsect2>