man pages: Downgrade the man pages according to the code.

Karolin

16 files changed, 543 insertions, 237 deletions

diff --git a/docs-xml/manpages-3/smbmnt.8.xml b/docs-xml/manpages-3/smbmnt.8.xml
new file mode 100644
index 00000000000..9425ce7c316
--- /dev/null
+++ b/docs-xml/manpages-3/smbmnt.8.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="smbmnt.8">
+
+<refmeta>
+	<refentrytitle>smbmnt</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbmnt</refname>
+	<refpurpose>helper utility for mounting SMB filesystems</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbmnt</command>
+		<arg choice="req">mount-point</arg>
+		<arg choice="opt">-s &lt;share&gt;</arg>
+		<arg choice="opt">-r</arg>
+		<arg choice="opt">-u &lt;uid&gt;</arg>
+		<arg choice="opt">-g &lt;gid&gt;</arg>
+		<arg choice="opt">-f &lt;mask&gt;</arg>
+		<arg choice="opt">-d &lt;mask&gt;</arg>
+		<arg choice="opt">-o &lt;options&gt;</arg>
+		<arg choice="opt">-h</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para><command>smbmnt</command> is a helper application used 
+	by the smbmount program to do the actual mounting of SMB shares. 
+	<command>smbmnt</command> can be installed setuid root if you want
+	normal users to be able to mount their SMB shares.</para>
+
+	<para>A setuid smbmnt will only allow mounts on directories owned
+	by the user, and that the user has write permission on.</para>
+
+	<para>The <command>smbmnt</command> program is normally invoked 
+	by <citerefentry><refentrytitle>smbmount</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry>. It should not be invoked directly by users. </para>
+
+	<para>smbmount searches the normal PATH for smbmnt. You must ensure
+	that the smbmnt version in your path matches the smbmount used.</para>
+
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>-r</term>
+		<listitem><para>mount the filesystem read-only 
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-u uid</term>
+		<listitem><para>specify the uid that the files will 
+		be owned by </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-g gid</term>
+		<listitem><para>specify the gid that the files will be 
+		owned by </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-f mask</term>
+		<listitem><para>specify the octal file mask applied
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-d mask</term>
+		<listitem><para>specify the octal directory mask 
+		applied  </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-o options</term>
+		<listitem><para>
+		list of options that are passed as-is to smbfs, if this
+		command is run on a 2.4 or higher Linux kernel.
+		</para></listitem>
+		</varlistentry>
+
+		&stdarg.help;
+
+	</variablelist>
+</refsect1>
+
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>Volker Lendecke, Andrew Tridgell, Michael H. Warfield 
+	and others.</para>
+	
+	<para>The current maintainer of smbfs and the userspace
+	tools <command>smbmount</command>, <command>smbumount</command>,
+	and <command>smbmnt</command> is <ulink 
+	url="mailto:urban@teststation.com">Urban Widmark</ulink>.
+	The <ulink url="mailto:samba@samba.org">SAMBA Mailing list</ulink>
+	is the preferred place to ask questions regarding these programs.
+	</para>
+	
+	<para>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
+	was done by Alexander Bokovoy.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages-3/smbmount.8.xml b/docs-xml/manpages-3/smbmount.8.xml
new file mode 100644
index 00000000000..85d0458f0ad
--- /dev/null
+++ b/docs-xml/manpages-3/smbmount.8.xml
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="smbmount.8">
+
+<refmeta>
+	<refentrytitle>smbmount</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbmount</refname>
+	<refpurpose>mount an smbfs filesystem</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbmount</command>
+		<arg choice="req">service</arg>
+		<arg choice="req">mount-point</arg>
+		<arg choice="opt">-o options</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para><command>smbmount</command> mounts a Linux SMB filesystem. It 
+	is usually invoked as <command>mount.smbfs</command> by
+	the <citerefentry><refentrytitle>mount</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry> command when using the 
+	"-t smbfs" option. This command only works in Linux, and the kernel must
+	support the smbfs filesystem.</para>
+
+	<para>WARNING: <command>smbmount</command> is deprecated and not
+	maintained any longer. <command>mount.cifs</command> (mount -t cifs)
+	should be used instead of <command>smbmount</command>.</para>
+
+	<para>Options to <command>smbmount</command> are specified as a comma-separated
+	list of key=value pairs. It is possible to send options other
+	than those listed here, assuming that smbfs supports them. If
+	you get mount failures, check your kernel log for errors on
+	unknown options.</para>
+
+	<para><command>smbmount</command> is a daemon. After mounting it keeps running until
+	the mounted smbfs is umounted. It will log things that happen
+	when in daemon mode using the "machine name" smbmount, so
+	typically this output will end up in <filename>log.smbmount</filename>. The <command>
+	smbmount</command> process may also be called mount.smbfs.</para>
+
+	<note><para> <command>smbmount</command> 
+	calls <citerefentry><refentrytitle>smbmnt</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry> to do the actual mount. You 
+	must make sure that <command>smbmnt</command> is in the path so 
+	that it can be found. </para></note>
+	
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>username=&lt;arg&gt;</term>
+		<listitem><para>
+		specifies the username to connect as. If this is not given, then the environment variable <envar> USER</envar>
+		is used. This option can also take the form "user%password" or "user/workgroup" or "user/workgroup%password"
+		to allow the password and workgroup to be specified as part of the username.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>password=&lt;arg&gt;</term>
+		<listitem><para>
+		specifies the SMB password. If this option is not given then the environment 
+		variable <literal>PASSWD</literal> is used. If it can find no password 
+		<command>smbmount</command> will prompt for a password, unless the guest option is given.
+		</para>
+
+		<para>
+		Note that passwords which contain the argument delimiter character (i.e. a comma ',') will failed to be parsed
+		correctly on the command line.  However, the same password defined in the PASSWD environment variable or a
+		credentials file (see below) will be read correctly.
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>credentials=&lt;filename&gt;</term>
+		<listitem><para>specifies a file that contains a username and/or password. 
+The format of the file is:
+<programlisting>
+username=value
+password=value
+</programlisting></para>
+
+		<para>This is preferred over having passwords in plaintext in a
+		shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
+		credentials file properly.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>krb</term>
+		<listitem><para>Use kerberos (Active Directory). </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>netbiosname=&lt;arg&gt;</term>
+		<listitem><para>sets the source NetBIOS name. It defaults 
+		to the local hostname. </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>uid=&lt;arg&gt;</term>
+		<listitem><para>sets the uid that will own all files on
+		the mounted filesystem.
+		It may be specified as either a username or a numeric uid.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>gid=&lt;arg&gt;</term>
+		<listitem><para>sets the gid that will own all files on
+		the mounted filesystem.
+		It may be specified as either a groupname or a numeric 
+		gid. </para></listitem>		
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>port=&lt;arg&gt;</term>
+		<listitem><para>sets the remote SMB port number. The default 
+		is 445, fallback is 139. </para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>fmask=&lt;arg&gt;</term>
+		<listitem><para>sets the file mask. This determines the 
+		permissions that remote files have in the local filesystem. 
+		This is not a umask, but the actual permissions for the files.
+		The default is based on the current umask. </para></listitem>
+		</varlistentry>
+		
+
+		<varlistentry>
+		<term>dmask=&lt;arg&gt;</term>
+		<listitem><para>Sets the directory mask. This determines the 
+		permissions that remote directories have in the local filesystem. 
+		This is not a umask, but the actual permissions for the directories.
+		The default is based on the current umask. </para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>debug=&lt;arg&gt;</term>
+		<listitem><para>Sets the debug level. This is useful for 
+		tracking down SMB connection problems. A suggested value to
+		start with is 4. If set too high there will be a lot of
+		output, possibly hiding the useful output.</para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>ip=&lt;arg&gt;</term>
+		<listitem><para>Sets the destination host or IP address.
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term>workgroup=&lt;arg&gt;</term>
+		<listitem><para>Sets the workgroup on the destination </para>
+		</listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>sockopt=&lt;arg&gt;</term>
+		<listitem><para>Sets the TCP socket options. See the <ulink
+		url="smb.conf.5.html#SOCKETOPTIONS"><citerefentry><refentrytitle>smb.conf</refentrytitle>
+		<manvolnum>5</manvolnum></citerefentry></ulink> <parameter>socket options</parameter> option.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>scope=&lt;arg&gt;</term>
+		<listitem><para>Sets the NetBIOS scope </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>guest</term>
+		<listitem><para>Don't prompt for a password </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>ro</term>
+		<listitem><para>mount read-only </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>rw</term><listitem><para>mount read-write </para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>iocharset=&lt;arg&gt;</term>
+		<listitem><para>
+		sets the charset used by the Linux side for codepage
+		to charset translations (NLS). Argument should be the
+		name of a charset, like iso8859-1. (Note: only kernel
+		2.4.0 or later)
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>codepage=&lt;arg&gt;</term>
+		<listitem><para>
+		sets the codepage the server uses. See the iocharset
+		option. Example value cp850. (Note: only kernel 2.4.0
+		or later)
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>ttl=&lt;arg&gt;</term>
+		<listitem><para>
+		sets how long a directory listing is cached in milliseconds
+		(also affects visibility of file size and date
+		changes). A higher value means that changes on the
+		server take longer to be noticed but it can give
+		better performance on large directories, especially
+		over long distances. Default is 1000ms but something
+		like 10000ms (10 seconds) is probably more reasonable
+		in many cases.
+		(Note: only kernel 2.4.2 or later)
+		</para></listitem>
+		</varlistentry>
+
+	</variablelist>
+
+
+</refsect1>
+
+<refsect1>
+	<title>ENVIRONMENT VARIABLES</title>
+
+	<para>The variable <envar>USER</envar> may contain the username of the
+	person using the client.  This information is used only if the
+	protocol level is high enough to support session-level
+	passwords. The variable can be used to set both username and
+	password by using the format username%password.</para>
+
+	<para>The variable <envar>PASSWD</envar> may contain the password of the
+	person using the client.  This information is used only if the
+	protocol level is high enough to support session-level
+	passwords.</para>
+
+	<para>The variable <envar>PASSWD_FILE</envar> may contain the pathname
+	of a file to read the password from. A single line of input is
+	read and used as the password.</para>
+</refsect1>
+
+<refsect1>
+	<title>OTHER COMMANDS</title>
+
+	<para>
+	File systems that have been mounted using the <command>smbmount</command>
+	can be unmounted using the <command>smbumount</command> or the UNIX system
+	<command>umount</command> command.
+	</para>
+
+</refsect1>
+
+
+<refsect1>
+	<title>BUGS</title>
+
+	<para>Passwords and other options containing , can not be handled.
+	For passwords an alternative way of passing them is in a credentials
+	file or in the PASSWD environment.</para>
+
+	<para>The credentials file does not handle usernames or passwords with
+	leading space.</para>
+
+	<para>One smbfs bug is important enough to mention here, even if it
+	is a bit misplaced:</para>
+
+	<itemizedlist>
+
+	<listitem><para>Mounts sometimes stop working. This is usually
+	caused by smbmount terminating. Since smbfs needs smbmount to
+	reconnect when the server disconnects, the mount will eventually go
+	dead. An umount/mount normally fixes this. At least 2 ways to
+	trigger this bug are known.</para></listitem>
+
+	</itemizedlist>
+
+	<para>Note that the typical response to a bug report is suggestion
+	to try the latest version first. So please try doing that first,
+	and always include which versions you use of relevant software
+	when reporting bugs (minimum: samba, kernel, distribution)</para>
+
+</refsect1>
+
+
+<refsect1>
+	<title>SEE ALSO</title>
+
+	<para>Documentation/filesystems/smbfs.txt in the linux kernel
+	source tree may contain additional options and information.</para>
+
+	<para>FreeBSD also has a smbfs, but it is not related to smbmount</para>
+
+	<para>For Solaris, HP-UX and others you may want to look at <citerefentry><refentrytitle>smbsh</refentrytitle>
+	<manvolnum>1</manvolnum></citerefentry> or at other solutions, such as 
+	Sharity or perhaps replacing the SMB server with a NFS server.</para>
+
+</refsect1>
+
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>Volker Lendecke, Andrew Tridgell, Michael H. Warfield 
+	and others.</para>
+	
+	<para>The current maintainer of smbfs and the userspace
+	tools <command>smbmount</command>, <command>smbumount</command>,
+	and <command>smbmnt</command> is <ulink 
+	url="mailto:urban@teststation.com">Urban Widmark</ulink>.
+	The <ulink url="mailto:samba@samba.org">SAMBA Mailing list</ulink>
+	is the preferred place to ask questions regarding these programs.
+	</para>
+	
+	<para>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
+	was done by Alexander Bokovoy.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages-3/smbumount.8.xml b/docs-xml/manpages-3/smbumount.8.xml
new file mode 100644
index 00000000000..9a214fb4067
--- /dev/null
+++ b/docs-xml/manpages-3/smbumount.8.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="smbumount.8">
+
+<refmeta>
+	<refentrytitle>smbumount</refentrytitle>
+	<manvolnum>8</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>smbumount</refname>
+	<refpurpose>smbfs umount for normal users</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>smbumount</command>
+		<arg choice="req">mount-point</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>With this program, normal users can unmount smb-filesystems, 
+	provided that it is suid root.  <command>smbumount</command> has 
+	been written to give normal Linux users more control over their 
+	resources. It is safe to install this program suid root, because only 
+	the user who has mounted a filesystem is allowed to unmount it again.  
+	For root it is not necessary to use smbumount. The normal umount 
+	program works perfectly well.</para>  
+
+	<para>WARNING: <command>smbumount</command> is deprecated and not
+        maintained any longer. <command>umount.cifs</command> 
+        should be used instead of <command>smbumount</command>.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>mount-point</term>
+		<listitem><para>The directory to unmount.</para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+
+<refsect1>
+	<title>SEE ALSO</title>
+	
+	<para><citerefentry><refentrytitle>smbmount</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry></para>
+</refsect1>
+
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>Volker Lendecke, Andrew Tridgell, Michael H. Warfield 
+	and others.</para>
+	
+	<para>The current maintainer of smbfs and the userspace
+	tools <command>smbmount</command>, <command>smbumount</command>,
+	and <command>smbmnt</command> is <ulink 
+	url="mailto:urban@teststation.com">Urban Widmark</ulink>.
+	The <ulink url="mailto:samba@samba.org">SAMBA Mailing list</ulink>
+	is the preferred place to ask questions regarding these programs.
+	</para>
+	
+	<para>The conversion of this manpage for Samba 2.2 was performed 
+	by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
+	was done by Alexander Bokovoy.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/smbdotconf/base/configbackend.xml b/docs-xml/smbdotconf/base/configbackend.xml
deleted file mode 100644
index f9da1345557..00000000000
--- a/docs-xml/smbdotconf/base/configbackend.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<samba:parameter name="config backend"
-                 context="G"
-				 type="enum"
-                 advanced="1" developer="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-		This controls the backend for storing the configuration.
-		Possible values are <emphasis>file</emphasis> (the default)
-		and <emphasis>registry</emphasis>.
-		When <smbconfoption name="config backend">registry</smbconfoption>
-		 is encountered while loading <emphasis>smb.conf</emphasis>,
-		the configuration read so far is dropped and the global
-		options are read from registry instead. So this triggers a
-		registry only configuration. Share definitions are not read
-		immediately but instead <parameter>registry
-		shares</parameter> is set to <emphasis>yes</emphasis>.
-	</para>
-	<para>
-		Note: This option can not be set inside the registry
-		configuration itself.
-	</para>
-</description>
-<value type="default">file</value>
-<value type="example">registry</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/browse/administrative_share.xml b/docs-xml/smbdotconf/browse/administrative_share.xml
deleted file mode 100644
index 95db5f1c85d..00000000000
--- a/docs-xml/smbdotconf/browse/administrative_share.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<samba:parameter name="administrative share"
-                 context="S"
-                 type="boolean"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-    <para>If this parameter is set to <constant>yes</constant> for
-      a share, then the share will be an administrative share. The Administrative
-      Shares are the default network shares created by all Windows NT-based
-      operating systems. These are shares like C$, D$ or ADMIN$. The type of these
-      shares is STYPE_DISKTREE_HIDDEN.</para>
-
-    <para>See the section below on <smbconfoption name="security"/> for more 
-      information about this option.</para>
-</description>
-<value type="default">no</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
deleted file mode 100644
index a926cec6458..00000000000
--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<samba:parameter name="client ldap sasl wrapping"
-                 context="G"
-               	 type="string"
-		 advanced="1" 
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-	The <smbconfoption name="client ldap sasl wrapping"/> defines whether
-	ldap traffic will be signed or signed and encrypted (sealed). 
-	Possible values are <emphasis>plain</emphasis>, <emphasis>sign</emphasis> 
-	and <emphasis>seal</emphasis>. 	
-	</para>
-
-	<para>
-	The values <emphasis>sign</emphasis> and <emphasis>seal</emphasis> are 
-	only available if Samba has been compiled against a modern 
-	OpenLDAP version (2.3.x or higher).
-	</para>
-	
-	<para>
-	This option is needed in the case of Domain Controllers enforcing 
-	the usage of signed LDAP connections (e.g. Windows 2000 SP3 or higher).
-	LDAP sign and seal can be controlled with the registry key
-	"<literal>HKLM\System\CurrentControlSet\Services\</literal>
-	<literal>NTDS\Parameters\LDAPServerIntegrity</literal>"
-	on the Windows server side.  
-	</para>
-
-	<para>
-	Depending on the used KRB5 library (MIT and older Heimdal versions)
-	it is possible that the message "integrity only" is not supported. 
-	In this case, <emphasis>sign</emphasis> is just an alias for 
-	<emphasis>seal</emphasis>.
-	</para>
-
-	<para>
-	The default value is <emphasis>plain</emphasis> which is not irritable 
-	to KRB5 clock skew errors. That implies synchronizing the time
-	with the KDC in the case of using <emphasis>sign</emphasis> or 
-	<emphasis>seal</emphasis>.
-	</para>
-</description>
-<value type="default">plain</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debugclass.xml b/docs-xml/smbdotconf/logging/debugclass.xml
deleted file mode 100644
index cc4b84acd7f..00000000000
--- a/docs-xml/smbdotconf/logging/debugclass.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<samba:parameter name="debug class"
-                 context="G"
-		 type="boolean"
-                 developer="1" advanced="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-    <para>
-    With this boolean parameter enabled, the debug class (DBGC_CLASS) 
-    will be displayed in the debug header.
-    </para>
-    <para>
-    For more information about currently available debug classes, see
-    section about <smbconfoption name="log level"/>.
-    </para>
-
-</description>
-<value type="default">no</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
deleted file mode 100644
index fdb6d40f25a..00000000000
--- a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<samba:parameter name="ldap debug level"
-		 type="integer"
-		context="G"
-		developer="1" advanced="1"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-		This parameter controls the debug level of the LDAP library
-		calls. In the case of OpenLDAP, it is the same
-		bit-field as understood by the server and documented in the
-		 <citerefentry>
-			<refentrytitle>slapd.conf</refentrytitle>
-			<manvolnum>5</manvolnum>
-		</citerefentry>
-		manpage.
-		A typical useful value will be
-		 <emphasis>1</emphasis> for tracing function calls.
-	</para>
-	<para>
-		The debug ouput from the LDAP libraries appears with the
-		prefix [LDAP] in Samba's logging output.
-		The level at which LDAP logging is printed is controlled by the
-		parameter <parameter>ldap debug threshold</parameter>.
-	</para>
-</description>
-<value type="default">0</value>
-<value type="example">1</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
deleted file mode 100644
index e023ff689bc..00000000000
--- a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<samba:parameter name="ldap debug threshold"
-		type="integer"
-		context="G"
-		developer="1" advanced="1"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-		This parameter controls the Samba debug level at which
-		the ldap library debug output is
-		printed in the Samba logs. See the description of
-		 <parameter>ldap debug level</parameter> for details.
-	</para>
-</description>
-<value type="default">10</value>
-<value type="example">5</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/registryshares.xml b/docs-xml/smbdotconf/misc/registryshares.xml
deleted file mode 100644
index 76c83e194c8..00000000000
--- a/docs-xml/smbdotconf/misc/registryshares.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<samba:parameter name="registry shares"
-                 context="G"
-		 type="bool"
-		 advanced="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-	This turns on or off support for share definitions read from
-	registry. Shares defined in <emphasis>smb.conf</emphasis> take
-	precedence over shares with the same name defined in
-	registry. See the section on registry-based configuration
-	for details. 
-	</para>
-
-	<para>
-		Note that this parameter defaults to <emphasis>no</emphasis>,
-		but it is set to <emphasis>yes</emphasis> when
-		 <parameter>config backend</parameter> is set
-		to <emphasis>registry</emphasis>.
-	</para>
-</description>
-<value type="default">no</value>
-<value type="example">yes</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
deleted file mode 100644
index 2df6c178db2..00000000000
--- a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<samba:parameter name="min receivefile size"
-		type="integer"
-		context="G"
-		advanced="1" developer="1"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-<para>This option changes the behavior of <citerefentry><refentrytitle>smbd</refentrytitle>
-<manvolnum>8</manvolnum></citerefentry> when processing SMBwriteX calls. Any incoming
-SMBwriteX call on a non-signed SMB/CIFS connection greater than this value will not be processed in the normal way but will
-be passed to any underlying kernel recvfile or splice system call (if there is no such
-call Samba will emulate in user space). This allows zero-copy writes directly from network
-socket buffers into the filesystem buffer cache, if available. It may improve performance
-but user testing is recommended. If set to zero Samba processes SMBwriteX calls in the
-normal way. To enable POSIX large write support (SMB/CIFS writes up to 16Mb) this option must be
-nonzero. The maximum value is 128k. Values greater than 128k will be silently set to 128k.</para>
-<para>Note this option will have NO EFFECT if set on a SMB signed connection.</para>
-<para>The default is zero, which diables this option.</para>
-</description>
-
-<related>min receivefile size</related>
-<value type="default">0</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml
index 5266fef6a24..d6383a75338 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -24,5 +24,5 @@
     attempted.</para>
 </description>
 
-<value type="default">no</value>
+<value type="default">yes</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/security/clientplaintextauth.xml b/docs-xml/smbdotconf/security/clientplaintextauth.xml
index c4061559db8..d6f4d08e8a8 100644
--- a/docs-xml/smbdotconf/security/clientplaintextauth.xml
+++ b/docs-xml/smbdotconf/security/clientplaintextauth.xml
@@ -7,6 +7,6 @@
 	<para>Specifies whether a client should send a plaintext 
 		password if the server does not support encrypted passwords.</para>
 </description>
-<value type="default">no</value>
+<value type="default">yes</value>
 </samba:parameter>
 
diff --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml
index 341952205f6..056cdc8bd22 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -29,5 +29,5 @@
     special configuration to use it.</para>
 </description>
 
-<value type="default">no</value>
+<value type="default">yes</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
deleted file mode 100644
index 19b81b3e0ae..00000000000
--- a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<samba:parameter name="winbind expand groups"
-                 context="G"
-		 type="integer"
-                 advanced="1" developer="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>This option controls the maximum depth that winbindd
-              will traverse when flattening nested group memberships
-	      of Windows domain groups.  This is different from the
-	      <smbconfoption name="winbind nested groups"/> option
-              which implements the Windows NT4 model of local group 
-	      nesting.  The &quot;winbind expand groups&quot;
-              parameter specifically applies to the membership of 
-	      domain groups.</para>
-
-	 <para>Be aware that a high value for this parameter can
-	 result in system slowdown as the main parent winbindd daemon
-	 must perform the group unrolling and will be unable to answer
-	 incoming NSS or authentication requests during this time.</para>
-  
-</description>
-
-<value type="default">1</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/winbind/winbindrpconly.xml b/docs-xml/smbdotconf/winbind/winbindrpconly.xml
deleted file mode 100644
index 53a08773502..00000000000
--- a/docs-xml/smbdotconf/winbind/winbindrpconly.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<samba:parameter name="winbind rpc only"
-	context="G"
-	type="string"
-		 advanced="1" developer="0"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-
-	<para>
-	Setting this parameter to <value type="example">yes</value> forces 
-	winbindd to use RPC instead of LDAP to retrieve information from Domain
-        Controllers.
-	</para>
-	
-</description>
-<value type="default">no</value>
-</samba:parameter>