updating my changes for new/removed/modified parameters in 3.0.23pre1

(This used to be commit 681189c925cefa8edcb4dc68ac1a05f563915618)

6 files changed, 33 insertions, 29 deletions

diff --git a/docs/smbdotconf/misc/dosfilemode.xml b/docs/smbdotconf/misc/dosfilemode.xml
index dbe7ac6b7a..ae3b475107 100644
--- a/docs/smbdotconf/misc/dosfilemode.xml
+++ b/docs/smbdotconf/misc/dosfilemode.xml
@@ -8,11 +8,10 @@
 	able to change the permissions on it.  However, this behavior
 	is often confusing to  DOS/Windows users.  Enabling this parameter 
 	allows a user who has write access to the file (by whatever 
-	means) to modify the permissions on it.  Note that a user
+	means) to modify the permissions (including ACL) on it.  Note that a user
 	belonging to the group owning the file will not be allowed to
 	change permissions if the group is only granted read access.
-	Ownership of the file/directory is not changed, only the permissions 
-	are modified.</para>
+	Ownership of the file/directory may also be changed.</para>
 </description>
 <value type="default">no</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/printing/addportcommand.xml b/docs/smbdotconf/printing/addportcommand.xml
new file mode 100644
index 0000000000..a5875cc59d
--- /dev/null
+++ b/docs/smbdotconf/printing/addportcommand.xml
@@ -0,0 +1,27 @@
+<samba:parameter name="add printer command"
+                 context="G"
+				 type="string"
+		 advanced="1" developer="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>Samba 3.0.23 introduces support for adding printer ports
+	remotely using the Windows &quot;Add Standard TCP/IP Port Wizard&quot;.
+	This option defines an external program to be executed when
+	smbd receives a request to add a new Port to the system.
+	he script is passed two parameters:
+    </para>
+		
+    <itemizedlist>
+	<listitem><para><parameter moreinfo="none">port name</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">device URI</parameter></para></listitem>
+    </itemizedlist>
+		
+    <para>The deviceURI is in the for of socket://&lt;hostname&gt;[:&lt;portnumber&gt;]
+	or lpd://&lt;hostname&gt;/&lt;queuename&gt;.</para>
+</description>
+
+<related>enum ports command</related>
+
+<value type="default"></value>
+<value type="example">/etc/samba/scripts/addport.sh</value>
+</samba:parameter>
diff --git a/docs/smbdotconf/security/aclgroupcontrol.xml b/docs/smbdotconf/security/aclgroupcontrol.xml
index 9def482061..493898553e 100644
--- a/docs/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs/smbdotconf/security/aclgroupcontrol.xml
@@ -30,14 +30,10 @@
 	</para>
 
 	<para>
-	This is a new parameter introduced in Samba 3.0.20.
+	This is parameter has been marked deprecated in Samba 3.0.23.  The same behavior is now
+	implemented by the <parameter moreinfo="none">dos filemode</parameter> option.
 	</para>
 
-	<para>
-	This can be particularly useful to allow groups to manage their own security on a part
-	of the filesystem they have group ownership of, removing the bottleneck of having only
-	the user owner or superuser able to reset permissions.
-	</para>
 </description>
 
 <related>inherit owner</related>
diff --git a/docs/smbdotconf/winbind/enableridalgorithm.xml b/docs/smbdotconf/winbind/enableridalgorithm.xml
deleted file mode 100644
index 15671b5b0e..0000000000
--- a/docs/smbdotconf/winbind/enableridalgorithm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<samba:parameter name="enable rid algorithm"
-                 context="G"
-                 advanced="1" developer="1" hide="1"
-				 type="boolean"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>This option is used to control whether or not smbd in Samba 3.0 should fallback
-	to the algorithm used by Samba 2.2 to generate user and group RIDs.  The longterm
-	development goal is to remove the algorithmic mappings of RIDs altogether, but 
-	this has proved to be difficult.  This parameter is mainly provided so that
-	developers can turn the algorithm on and off and see what breaks.  This parameter
-	should not be disabled by non-developers because certain features in Samba will fail 
-	to work without it.
-	</para>
-
-</description>
-<value type="default">yes</value>
-</samba:parameter>
diff --git a/docs/smbdotconf/winbind/winbindenumgroups.xml b/docs/smbdotconf/winbind/winbindenumgroups.xml
index 9a6734f3bb..74f6feed01 100644
--- a/docs/smbdotconf/winbind/winbindenumgroups.xml
+++ b/docs/smbdotconf/winbind/winbindenumgroups.xml
@@ -16,5 +16,5 @@
 <warning><para>Turning off group enumeration may cause some programs to behave oddly.  </para></warning>
 </description>
 
-<value type="default">yes</value>
+<value type="default">no</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/winbind/winbindenumusers.xml b/docs/smbdotconf/winbind/winbindenumusers.xml
index c8ac38bd6c..002c6e065a 100644
--- a/docs/smbdotconf/winbind/winbindenumusers.xml
+++ b/docs/smbdotconf/winbind/winbindenumusers.xml
@@ -19,5 +19,5 @@
 	usernames. </para></warning>
 </description>
 
-<value type="default">yes</value>
+<value type="default">no</value>
 </samba:parameter>