Add ads-only options for net ads join

diff --git a/docs/manpages-3/net.8.xml b/docs/manpages-3/net.8.xml
index 39641c2f46b02eb95a324f73d15b345e5e79722f..cd0278178e5282cbd585834955beba006ac0b2c3 100644 (file)
--- a/docs/manpages-3/net.8.xml
+++ b/docs/manpages-3/net.8.xml
@@ -181,7 +181,7 @@ the remote server using <command>/bin/date</command>. </para>
 </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 @@ be created.</para>
 [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@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>