Merge of documentation updates to HEAD. These got missed somewhere along

the way.
(This used to be commit afad150bacfd02ec83c57ea9ba9152ff59fb7eee)

2 files changed, 41 insertions, 10 deletions

diff --git a/docs/docbook/samba-pdc-faq.sgml b/docs/docbook/samba-pdc-faq.sgml
index 10d3ec6a04..4034987480 100644
--- a/docs/docbook/samba-pdc-faq.sgml
+++ b/docs/docbook/samba-pdc-faq.sgml
@@ -8,7 +8,7 @@
         <firstname>David</firstname><surname>Bannon</surname>
         <affiliation><orgname>La Trobe University</orgname></affiliation>
     </author>
-    <address><email>D.Bannon@latrobe.edu.au</email></address>    
+    <address><email>dbannon@samba.org</email></address>    
     <pubdate>November 2000</pubdate>
 </bookinfo>
 
@@ -45,11 +45,26 @@
 <sect1><title id=stateofplay>State of Play</title>
 	<para><emphasis>It should be noted that 2.2.0 in its pre-release form still has a few problems,
 	I'll try and keep this section current while things are still dynamic. 
-	At the time of this update (November 13, 2000) the current state of play is :</emphasis></para>
+	At the time of this update (December 15, 2000) the current state of play is :</emphasis></para>
 
     <para>Comments here about W2K joining the domain apply only to Samba 2.2 from the CVS after November 27th. The
     'snapshot' release Samba2.2alpha1 does not work !!! See below on how to get a CVS tree.</para>
 
+    <para><command>Known Bug !</>W2K machines will not successfully join a domain with a name that
+    is made up from an even number of characters. Yep, thats right ! BIOTEST is OK as is MYDOMAI
+    but MYDOMAIN will not work until this bug is fixed. Hmm.., we believe
+	that this bug is fixed, but see below.</para> 
+
+    <para><command>Known Bug !</>After some bugs were fixed just before
+    Christmas, W2K SP1 machines cannot join the domain. Expected to be
+    fixed early in the new year. Whats that ? yeah, samba developers
+    have a Christmas break too !</para>
+
+
+    <para><command>Know Bug !</>NTs (and possibly W2K ?) are not told the logged on user is a domain
+    admin if the parameter "domain admin users = user" is used. The alternative, "domain admin group"
+    does work. See the HowTo.</>
+
     <para>Client Side creation of Machine accounts does work but is not complete. 
     Firstly, the <filename>add user script</> runs as the user who's
     name was entered, not as root. Secondly, the machine name passed to the script (%U) 
@@ -799,7 +814,7 @@
 	and documentation.  The docs that come with the samba distribution contain very 
 	good explanations of general SMB topics such as browsing.</para> 
 
-<sect2><title>URLs and similar</title>
+<sect2><title id=urls>URLs and similar</title>
 
 
 <itemizedlist>
@@ -824,6 +839,10 @@
 		http://www.kneschke.de/projekte/samba_tng</ulink>, but again, a 
 		lot of it does not apply to the main stream Samba.</para></listitem>
 
+    <listitem><para>See how Scott Merrill simulates a BDC behaviour at 
+        <ulink url="http://www.skippy.net/linux/smb-howto.html">
+        http://www.skippy.net/linux/smb-howto.html</>. </para></listitem>
+
     <listitem><para>Although 2.0.7 has almost had its day as a PDC, I (drb) will
         keep the 2.0.7 PDC pages at <ulink url="http://bioserve.latrobe.edu.au/samba">
         http://bioserve.latrobe.edu.au/samba</ulink> going for a while yet.</para></listitem>
diff --git a/docs/docbook/samba-pdc-howto.sgml b/docs/docbook/samba-pdc-howto.sgml
index 38e1ecf056..4b8380dd9e 100644
--- a/docs/docbook/samba-pdc-howto.sgml
+++ b/docs/docbook/samba-pdc-howto.sgml
@@ -25,7 +25,7 @@
 
 <dedication><title></title>
 
-    <para>Comments, corrections and additions to <email>D.Bannon@latrobe.edu.au</email></para>
+    <para>Comments, corrections and additions to <email>dbannon@samba.org</email></para>
 
     <para>
 	This document explains how to setup Samba as a Primary Domain Controller and 
@@ -255,7 +255,7 @@ developmental versions of Samba, particularly
 	encrypt passwords = yes 
 	domain logons =yes 
 	logon script = scripts\%U.bat 
-	domain admin users = root dbannon andrew 
+	domain admin group = @adm 
 	add user script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %m$	
 	guest account = ftp 
 	share modes=no 
@@ -294,8 +294,19 @@ developmental versions of Samba, particularly
 	</listitem>
 </varlistentry>
 
+
+<varlistentry><term>domain admin group = @adm</term>
+	<listitem><para>This parameter specifies a unix group whose members will be granted 
+    admin privileges on a NT workstation when
+	logged onto that workstation. See the section called <link linkend=domainadmin>
+    Domain Admin</> Accounts.</para>
+	</listitem>
+</varlistentry>
+
 <varlistentry><term>domain admin users = user1 users2</term>
-	<listitem><para>This parameter specifies a unix user who will be granted admin privileges 
+	<listitem><para>It appears that this parameter does not funtion correctly at present.
+    Use the 'domain admin group' instread. This parameter specifies a unix user who will 
+    be granted admin privileges 
 	on a NT workstation when
 	logged onto that workstation. See the section called <link linkend=domainadmin>
     Domain Admin</> Accounts.</para>
@@ -510,15 +521,16 @@ developmental versions of Samba, particularly
 	<para>Samba 2.2 recognizes particular users as being
 	domain admins and tells the NTws when it thinks that it has got one logged on. 
 	In the smb.conf file we declare
-	that the <filename>Domain Admin users = user1 user2</filename>. 
-	Any user mentioned here will be treated as a Domain Admin by a NTws when 
+	that the <filename>Domain Admin group = @adm</filename>. 
+	Any user who is a menber of the unix group 'adm' is treated as a Domain Admin by a NTws when 
 	logged onto the Domain. They will have full Administrator rights 
 	including the rights to change permissions on files and run the system 
-	utilities such as Disk Administrator.</para> 
+	utilities such as Disk Administrator. Add users to the group by editing <filename>
+    /etc/group/</>. You do not need to use the 'adm' group, choose any one you like.</para> 
 
 	<para>Further, and this is very new, they will be allowed to create a 
 	new machine account when first connecting a new NT or W2K machine to 
-	the domain. <emphasis>At present, ie pre-release, only a Domain Admin who
+	the domain. <emphasis>However, at present, ie pre-release, only a Domain Admin who
 	also happens to be root can do so. </emphasis></para>
 </sect1>
 </chapter>