From 1268992fa30b404c9de694a150282c3378feecde Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 16 Apr 2003 18:45:42 +0000
Subject: I've changed 'net rpc join', so I should doco it...

Andrew Bartlett
(This used to be commit b12164729d61c4c6c4824ac1dad2c440f6852c06)
---
 docs/docbook/manpages/net.8.sgml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'docs/docbook')

diff --git a/docs/docbook/manpages/net.8.sgml b/docs/docbook/manpages/net.8.sgml
index 45bb3bcbcd..a22797845b 100644
--- a/docs/docbook/manpages/net.8.sgml
+++ b/docs/docbook/manpages/net.8.sgml
@@ -201,21 +201,29 @@ the remote server using <command>/bin/date</command>. </para>
 </refsect2>
 
 <refsect2>
-<title>[RPC|ADS] JOIN [OLDSTYLE] [-U username[%password]] [options]</title>
+<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [options]</title>
 
 <para>
-Join a domain with specified username and password. Password 
-will be prompted if none is specified. If no 
-user name is specified, a domain created in server manager 
-can be joined.
+Join a domain.  If the account already exists on the server, and 
+[TYPE] is MEMBER, the machine will attempt to join automatically. 
+(Assuming that the machine has been created in server manager)
+Otherwise, a password will be prompted for, and a new account may
+be created.</param>
+
+<para>
+[TYPE] may be PDC, BDC or MEMBER to specify the type of server
+joining the domain.
 </para>
+</refsect2>
+
+<refsect2>
+<title>[RPC] OLDJOIN [options]</title>
 
-<para>Specify [OLDSTYLE] to join the domain using the old 
-style of domain joining - you need to create a trust 
+<para>Join a domain. Use the OLDJOIN option to join the domain 
+using the old style of domain joining - you need to create a trust 
 account in server manager first.</para>
 </refsect2>
-	
-<refsect2>
+
 <title>[RPC|ADS] USER</title>
 
 <refsect3>
-- 
cgit