s3-auth: Remove docs about obsolete 'update encrypted' option.

3 files changed, 3 insertions, 82 deletions

diff --git a/docs-xml/smbdotconf/security/updateencrypted.xml b/docs-xml/smbdotconf/security/updateencrypted.xml
deleted file mode 100644
index eb54ed9bab..0000000000
--- a/docs-xml/smbdotconf/security/updateencrypted.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<samba:parameter name="update encrypted"
-                 context="G"
-				 type="boolean"
-                 basic="1" advanced="1" developer="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-
-    <para>
-	This boolean parameter allows a user logging on with a plaintext password to have their encrypted (hashed)
-	password in the smbpasswd file to be updated automatically as they log on. This option allows a site to
-	migrate from plaintext password authentication (users authenticate with plaintext password over the
-	wire, and are checked against a UNIX account database) to encrypted password authentication (the SMB
-	challenge/response authentication mechanism) without forcing all users to re-enter their passwords via
-	smbpasswd at the time the change is made. This is a convenience option to allow the change over to encrypted
-	passwords to be made over a longer period.  Once all users have encrypted representations of their passwords
-	in the smbpasswd file this parameter should be set to <constant>no</constant>.
-	</para>
-
-    <para>
-	In order for this parameter to be operative the <smbconfoption name="encrypt passwords"/> parameter must 
-    be set to <constant>no</constant>. The default value of <smbconfoption name="encrypt
-	passwords">Yes</smbconfoption>. Note: This must be set to <constant>no</constant> for this <smbconfoption
-	name="update encrypted"/> to work.
-	</para>
-
-    <para>
-	Note that even when this parameter is set, a user authenticating to <command moreinfo="none">smbd</command>
-	must still enter a valid password in order to connect correctly, and to update their hashed (smbpasswd)
-	passwords.
-	</para>
-</description>
-
-<value type="default">no</value>
-</samba:parameter>
diff --git a/docs-xml/using_samba/appc.xml b/docs-xml/using_samba/appc.xml
index 76fc5e813d..f4b4666bca 100644
--- a/docs-xml/using_samba/appc.xml
+++ b/docs-xml/using_samba/appc.xml
@@ -2728,20 +2728,6 @@ compatibility with older-client bugs.</para>
 </refsynopsisdiv>
 </refentry>
 
-<refentry id="appc-refentry-194">
-<refmeta>
-<refmiscinfo class="allowable values">YES, NO</refmiscinfo>
-<refmiscinfo class="default">NO</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>update encrypted = boolean</refname>
-</refnamediv>
-<refsynopsisdiv>
-<para>Updates the Microsoft-format password file when a user logs in with unencrypted passwords. Provided to ease conversion to encryped passwords for Windows 95/98 and NT. Added in Samba 1.9.18p5.</para>
-
-</refsynopsisdiv>
-</refentry>
-
 <refentry id="appc-refentry-195">
 <refmeta>
 <refmiscinfo class="allowable values">comma-separated list of user names</refmiscinfo>
diff --git a/docs-xml/using_samba/ch06.xml b/docs-xml/using_samba/ch06.xml
index e0973b6cc8..b099e96071 100644
--- a/docs-xml/using_samba/ch06.xml
+++ b/docs-xml/using_samba/ch06.xml
@@ -1592,20 +1592,6 @@ Password changed for user dave</programlisting>
 
 <row>
 
-<entry colname="col1"><para><literal>update encrypted</literal></para></entry>
-
-<entry colname="col2"><para>boolean</para></entry>
-
-<entry colname="col3"><para>If <literal>yes</literal>, Samba updates the encrypted password file when a client connects to a share with a plaintext password.</para></entry>
-
-<entry colname="col4"><para><literal>no</literal></para></entry>
-
-<entry colname="col5"><para>Global</para></entry>
-
-</row>
-
-<row>
-
 <entry colname="col1"><para><literal>null passwords</literal></para></entry>
 
 <entry colname="col2"><para>boolean</para></entry>
@@ -1769,23 +1755,6 @@ password level</title>
 
 
 <sect3 role="" label="6.4.4.7" id="ch06-SECT-4.3.7">
-<indexterm id="ch06-idx-969481-0"><primary>pdate encrypted option</primary></indexterm>
-<title>update encrypted</title>
-
-
-<para>For sites switching over to the <indexterm id="ch06-idx-967799-0"><primary>encrypted passwords</primary><secondary>Microsoft format</secondary></indexterm>encrypted password format, Samba provides an option that should help with the transition. The <literal>update</literal> <literal>encrypted</literal> option allows a site to ease into using encrypted passwords from plaintext passwords. You can activate this option as follows:</para>
-
-
-<programlisting>[global]
-    update encrypted = yes</programlisting>
-
-
-<para>This instructs Samba to create an encrypted version of each user's Unix password in the <filename>smbpasswd</filename> file each time he or she connects to a share. When this option is enabled, you must have the <literal>encrypt</literal> <literal>passwords</literal> option set to <literal>no</literal> so that the client will pass plaintext passwords to Samba to use to update the files. Once each user has connected at least once, you can set <literal>encrypted</literal> <literal>passwords</literal> <literal>=</literal> <literal>yes</literal>, allowing you to use only the encrypted passwords. The user must already have a valid entry in the <filename>smbpasswd</filename> file for this option to work.</para>
-</sect3>
-
-
-
-<sect3 role="" label="6.4.4.8" id="ch06-SECT-4.3.8">
 <title>null passwords</title>
 
 
@@ -1801,7 +1770,7 @@ password level</title>
 
 
 
-<sect3 role="" label="6.4.4.9" id="ch06-SECT-4.3.9">
+<sect3 role="" label="6.4.4.8" id="ch06-SECT-4.3.8">
 <indexterm id="ch06-idx-969483-0"><primary>smb passwd file option</primary></indexterm>
 <title>
 smb passwd file</title>
@@ -1820,7 +1789,7 @@ smb passwd file</title>
 
 
 
-<sect3 role="" label="6.4.4.10" id="ch06-SECT-4.3.10">
+<sect3 role="" label="6.4.4.9" id="ch06-SECT-4.3.9">
 <indexterm id="ch06-idx-969486-0"><primary>hosts equiv option</primary></indexterm>
 <title>
 hosts equiv</title>
@@ -1838,7 +1807,7 @@ hosts equiv</title>
 
 
 
-<sect3 role="" label="6.4.4.11" id="ch06-SECT-4.3.11">
+<sect3 role="" label="6.4.4.10" id="ch06-SECT-4.3.10">
 <indexterm id="ch06-idx-969487-0"><primary>use rhosts option</primary></indexterm>
 <title>
 use rhosts</title>