samba: Change default process model to prefork

[kai/samba-autobuild/.git] / docs-xml / manpages / samba.8.xml

diff --git a/docs-xml/manpages/samba.8.xml b/docs-xml/manpages/samba.8.xml
index 9ce65c850b3b4f38cb2aa5e6d6e2053a997f6086..8d548d85fddf39abfd4a2d7303e95ae53daa0c63 100644 (file)
--- a/docs-xml/manpages/samba.8.xml
+++ b/docs-xml/manpages/samba.8.xml
@@ -7,7 +7,7 @@
        <manvolnum>8</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-       <refmiscinfo class="version">4.0</refmiscinfo>
+       <refmiscinfo class="version">&doc.version;</refmiscinfo>
 </refmeta>
 
 
@@ -101,14 +101,39 @@
                </varlistentry>
 
                <varlistentry>
-               <term>-M model</term>
+               <term>-M|--model</term>
                <listitem><para>This parameter can be used to specify the
                &quot;process model&quot; samba should use. This determines
                how concurrent clients are handled. Available process
-               models include <emphasis>single</emphasis> (everything in
-               a single process), <emphasis>standard</emphasis> (similar
-               behaviour to that of Samba 3), <emphasis>thread</emphasis>
-               (single process, different threads.
+               models include:
+               <itemizedlist>
+                       <listitem><para><emphasis>single</emphasis></para>
+                       <para>All Samba services run in a single process. This is
+                       not recommended for production configurations.
+                       </para></listitem>
+
+                       <listitem><para><emphasis>standard</emphasis></para>
+                       <para>A process is created for each Samba service,
+                       and for those services that support it (currently only
+                       LDAP and NETLOGON) a new processes is started
+                       for each new client connection.</para></listitem>
+
+                       <listitem><para><emphasis>prefork</emphasis></para>
+                       <para>The default. A process is started for each Samba service,
+                       and a fixed number of worker processes are started for those
+                       services that support it (currently LDAP, NETLOGON, and KDC).
+                       The client connections are then shared amongst the worker
+                       processes.
+                       Requests for services not supporting prefork are handled
+                       by a single process for that service.</para>
+                       <para>The number of prefork worker processes started is
+                       controlled by the
+                       <citerefentry><refentrytitle>smb.conf</refentrytitle>
+                       <manvolnum>5</manvolnum></citerefentry> parameter
+                       <smbconfoption name="prefork children"/>,
+                       which defaults to 4.
+                       </para></listitem>
+               </itemizedlist>
                </para></listitem>
                </varlistentry>
 
@@ -125,43 +150,16 @@
                </para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-?|--help</term>
-               <listitem><para>Show help message.</para></listitem>
-               </varlistentry>
-
                <varlistentry>
                <term>--usage</term>
                <listitem><para>Display brief usage message.</para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-d|--debuglevel=DEBUGLEVEL</term>
-               <listitem><para>Set debug level.</para></listitem>
-               </varlistentry>
-
                <varlistentry>
                <term>--debug-stderr</term>
                <listitem><para>Send debug output to STDERR.</para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-s|--configfile=CONFIGFILE</term>
-               <listitem><para>Use alternative configuration file.
-               </para></listitem>
-               </varlistentry>
-
-               <varlistentry>
-               <term>--option=SMB_CONF_PARAM=VALUE</term>
-               <listitem><para>Set smb.conf option from command line.
-               </para></listitem>
-               </varlistentry>
-
-               <varlistentry>
-               <term>-l|--log-basename=LOGFILEBASE</term>
-               <listitem><para>Basename for log/debug files.</para></listitem>
-               </varlistentry>
-
                <varlistentry>
                <term>--leak-report</term>
                <listitem><para>Enable talloc leak reporting on exit.
@@ -174,10 +172,8 @@
                </para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-V|--version</term>
-               <listitem><para>Print version.</para></listitem>
-               </varlistentry>
+               &popt.common.samba.server;
+               &popt.autohelp;
        </variablelist>
 </refsect1>
 
@@ -188,7 +184,7 @@
                <varlistentry>
                <term><filename>/etc/rc</filename></term>
                <listitem><para>or whatever initialization script your
-               system uses).</para>
+               system uses.</para>
 
                <para>If running the server as a daemon at startup,
                this file will need to contain an appropriate startup
@@ -241,7 +237,7 @@
 <refsect1>
        <title>VERSION</title>
 
-       <para>This man page is correct for version 4 of the Samba suite.</para>
+       <para>This man page is part of version &doc.version; of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
@@ -257,8 +253,8 @@
        <manvolnum>1</manvolnum></citerefentry>, and the
        Internet RFC's  <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
        In addition the CIFS (formerly SMB) specification is available
-       as a link from the Web page <ulink noescape="1" url="http://samba.org/cifs/">
-       http://samba.org/cifs/</ulink>.</para>
+       as a link from the Web page <ulink noescape="1" url="https://www.samba.org/cifs/">
+       https://www.samba.org/cifs/</ulink>.</para>
 </refsect1>
 
 <refsect1>