ctdb-tests: Drop all_ips argument from read_ctdb_public_ip_info()

[sharpe/samba-autobuild/.git] / docs-xml / manpages / smb.conf.5.xml

diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e605f04c629da1aa2092fb6f26ca0e129a9b7b94..cc779584c83c256d28b268c01a0cc09a940a33e9 100644 (file)
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -6,7 +6,7 @@
        <manvolnum>5</manvolnum>
        <refmiscinfo class="source">Samba</refmiscinfo>
        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-       <refmiscinfo class="version">4.0</refmiscinfo>
+       <refmiscinfo class="version">4.4</refmiscinfo>
 </refmeta>
 
 
@@ -21,10 +21,8 @@
        <para>
        The <filename moreinfo="none">smb.conf</filename> file is a configuration  file for the Samba suite. <filename
        moreinfo="none">smb.conf</filename> contains  runtime configuration information for the Samba programs. The
-        <filename moreinfo="none">smb.conf</filename> file is designed to be configured and administered by the
-        <citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> program. The
        complete description of the file format and possible parameters held within are here for reference purposes.
-       </para> 
+       </para>
 </refsect1>
 
 <refsect1 id="FILEFORMATSECT">
@@ -472,8 +470,11 @@ chmod 1770 /usr/local/samba/lib/usershares
                
                <varlistentry>
                <term>%R</term>
-               <listitem><para>the selected protocol level after protocol negotiation. It can be one of CORE, COREPLUS, 
-                       LANMAN1, LANMAN2 or NT1.</para></listitem>
+               <listitem><para>the selected protocol level after protocol negotiation. It can be one of
+                       CORE, COREPLUS, LANMAN1, LANMAN2, NT1,
+                       SMB2_02, SMB2_10, SMB2_22, SMB2_24,
+                       SMB3_00, SMB3_02, SMB3_10, SMB3_11
+                       or SMB2_FF.</para></listitem>
                </varlistentry>
 
                <varlistentry>
@@ -800,13 +801,14 @@ chmod 1770 /usr/local/samba/lib/usershares
        <para>
        <citerefentry><refentrytitle>samba</refentrytitle>
        <manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbpasswd</refentrytitle>
-       <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>swat</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
+       <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>winbindd</refentrytitle>
+       <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+       <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba-tool</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
-       <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
        <manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>