From: John Terpstra <jht@samba.org>
Date: Fri, 2 Dec 2005 20:02:27 +0000 (+0000)
Subject: Removal of parameter mistakenly readded into list.
X-Git-Tag: samba-4.0.0alpha6~801^2~1972
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dcee1338a9b7c07f4f7ea3bd8929ac49218c7f1;p=thirdparty%2Fsamba.git

Removal of parameter mistakenly readded into list.
(This used to be commit b64e7b8b866ba665c546a833c73a15275fa5be17)
---

diff --git a/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml b/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
index 0983f8fb53a..6b1ab1650ed 100644
--- a/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
@@ -183,33 +183,33 @@ In alphabetical order, these are the parameters eliminated from Samba-2.2.x thro
 </para>
 
 <itemizedlist>
-	<listitem><para>admin log </para></listitem>
-	<listitem><para>alternate permissions </para></listitem>
-	<listitem><para>character set </para></listitem>
-	<listitem><para>client codepage </para></listitem>
-	<listitem><para>code page directory </para></listitem>
-	<listitem><para>coding system </para></listitem>
-	<listitem><para>domain admin group </para></listitem>
-	<listitem><para>domain guest group </para></listitem>
+	<listitem><para>admin log</para></listitem>
+	<listitem><para>alternate permissions</para></listitem>
+	<listitem><para>character set</para></listitem>
+	<listitem><para>client codepage</para></listitem>
+	<listitem><para>code page directory</para></listitem>
+	<listitem><para>coding system</para></listitem>
+	<listitem><para>domain admin group</para></listitem>
+	<listitem><para>domain guest group</para></listitem>
 	<listitem><para>enable svcctl</para></listitem>
-	<listitem><para>force unknown acl user </para></listitem>
+	<listitem><para>force unknown acl user</para></listitem>
 	<listitem><para>ldap filter</para></listitem>
-	<listitem><para>min password length (deprecated)</para></listitem>
-	<listitem><para>nt smb support </para></listitem>
-	<listitem><para>post script </para></listitem>
+	<listitem><para>min password length</para></listitem>
+	<listitem><para>nt smb support</para></listitem>
+	<listitem><para>post script</para></listitem>
 	<listitem><para>printer admin</para></listitem>
-	<listitem><para>printer driver </para></listitem>
-	<listitem><para>printer driver file </para></listitem>
-	<listitem><para>printer driver location </para></listitem>
+	<listitem><para>printer driver</para></listitem>
+	<listitem><para>printer driver file</para></listitem>
+	<listitem><para>printer driver location</para></listitem>
 	<listitem><para>read size</para></listitem>
 	<listitem><para>source environment</para></listitem>
 	<listitem><para>status </para></listitem>
 	<listitem><para>strip dot </para></listitem>
-	<listitem><para>total print jobs </para></listitem>
+	<listitem><para>total print jobs</para></listitem>
 	<listitem><para>unicode</para></listitem>
-	<listitem><para>use rhosts </para></listitem>
-	<listitem><para>valid chars </para></listitem>
-	<listitem><para>vfs options </para></listitem>
+	<listitem><para>use rhosts</para></listitem>
+	<listitem><para>valid chars</para></listitem>
+	<listitem><para>vfs options</para></listitem>
 	<listitem><para>winbind enable local accounts</para></listitem>
 </itemizedlist>
 
@@ -335,7 +335,6 @@ In alphabetical order, these are the parameters eliminated from Samba-2.2.x thro
 	<listitem><para>idmap gid</para></listitem>
 	<listitem><para>idmap uid</para></listitem>
 	<listitem><para>username map script</para></listitem>
-	<listitem><para>winbind enable local accounts</para></listitem>
 	<listitem><para>winbind nested groups</para></listitem>
 	<listitem><para>winbind nss info</para></listitem>
 	<listitem><para>winbind trusted domains only</para></listitem>
@@ -383,8 +382,8 @@ In alphabetical order, these are the parameters eliminated from Samba-2.2.x thro
 	<listitem><para>security (new ads value) </para></listitem>
 	<listitem><para>strict locking (enabled by default) </para></listitem>
 	<listitem><para>winbind cache time (increased to 5 minutes) </para></listitem>
-	<listitem><para>winbind uid (deprecated in favor of idmap uid) </para></listitem>
-	<listitem><para>winbind gid (deprecated in favor of idmap gid) </para></listitem>
+	<listitem><para>winbind uid (deprecated in favor of idmap uid)</para></listitem>
+	<listitem><para>winbind gid (deprecated in favor of idmap gid)</para></listitem>
 	<listitem><para>winbindd nss info</para></listitem>
 	<listitem><para>write cache (deprecated)</para></listitem>
 </itemizedlist>