1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00

docs-xml: fix typos and format in smb.conf server max protocol man

This commit is contained in:
Björn Baumbach 2012-06-27 13:06:50 +02:00 committed by Bjoern Jacke
parent 11fc75fcb5
commit f6ac6b8f3c
4 changed files with 51 additions and 25 deletions

View File

@ -1988,10 +1988,34 @@ string.</member>
<refsect3>
<title>REGISTRY IMPORT <replaceable>file</replaceable><!--
--><replaceable>[opt]</replaceable></title>
<para>Import a registration entries (.reg) <emphasis>file</emphasis>.
</para>
--><replaceable> [--precheck &lt;check-file&gt;] [opt]</replaceable></title>
<para>Import a registration entries (.reg) <emphasis>file</emphasis>.</para>
<para>The following options are available:</para>
<variablelist>
<varlistentry><term>--precheck <replaceable>check-file</replaceable></term>
<listitem><para>
This is a mechanism to check the existence or non-existence of
certain keys or values specified in a precheck file before applying
the import file.
The import file will only be applied if the precheck succeeds.
</para>
<para>
The check-file follows the normal registry file syntax with the
following semantics:
</para>
<itemizedlist>
<listitem><para>&lt;value name&gt;=&lt;value&gt; checks whether the
value exists and has the given value.</para></listitem>
<listitem><para>&lt;value name&gt;=- checks whether the value does
not exist.</para></listitem>
<listitem><para>[key] checks whether the key exists.</para>
</listitem>
<listitem><para>[-key] checks whether the key does not exist.</para>
</listitem>
</itemizedlist>
</listitem>
</varlistentry>
</variablelist>
</refsect3>
<refsect3>

View File

@ -1,11 +1,11 @@
<samba:parameter name="ncalrpc dir"
context="G"
advanced="1" developer="1"
context="G"
advanced="1" developer="1"
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This directory will hold a series of named pipes to allow RPC over inter-process communication. </para>.
<para>This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP. Additionally a sub-directory 'np' has restricted permissions, and allows a trusted communication channel between Samba processes</para>
<para>This directory will hold a series of named pipes to allow RPC over inter-process communication.</para>
<para>This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP. Additionally a sub-directory 'np' has restricted permissions, and allows a trusted communication channel between Samba processes</para>
</description>
<value type="default">${prefix}/var/ncalrpc</value>

View File

@ -1,8 +1,8 @@
<samba:parameter name="server max protocol"
context="G"
type="enum"
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
context="G"
type="enum"
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The value of the parameter (a string) is the highest
protocol level that will be supported by the server.</para>
@ -20,9 +20,8 @@
</listitem>
<listitem>
<para><constant>LANMAN1</constant>: First <emphasis>
modern</emphasis> version of the protocol. Long filename
support.</para>
<para><constant>LANMAN1</constant>: First <emphasis>modern</emphasis>
version of the protocol. Long filename support.</para>
</listitem>
<listitem>
@ -33,39 +32,42 @@
<para><constant>NT1</constant>: Current up to date version of the protocol.
Used by Windows NT. Known as CIFS.</para>
</listitem>
<listitem>
<para><constant>SMB2</constant>: Re-implementation of the SMB protocol.
Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available.</para>
<itemizedlist>
<listitem>
<para><constant>SMB2_02</constant>: The earliest SMB2 version.</para>
<para><constant>SMB2_02</constant>: The earliest SMB2 version.</para>
</listitem>
<listitem>
<para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
<para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
</listitem>
<listitem>
<para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
<para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
</listitem>
<listitem>
<para><constant>SMB2_24</constant>: Windows 8 beta SMB2 version.</para>
<para><constant>SMB2_24</constant>: Windows 8 beta SMB2 version.</para>
</listitem>
</itemizedlist>
<para>By default SMB2 selects the SMB2_02 varient.</para>
<para>By default SMB2 selects the SMB2_02 variant.</para>
</listitem>
<listitem>
<para><constant>SMB3</constant>: The same as SMB2.
Used by Windows 8. SMB3 has sub protocols available.</para>
<itemizedlist>
<listitem>
<para><constant>SMB3_00</constant>: Windows 8 SMB3 version. (mostly the same as SMB2_24)</para>
<para><constant>SMB3_00</constant>: Windows 8 SMB3 version. (mostly the same as SMB2_24)</para>
</listitem>
</itemizedlist>
<para>By default SMB3 selects the SMB3_00 varient.</para>
<para>By default SMB3 selects the SMB3_00 variant.</para>
</listitem>
</itemizedlist>
<para>Normally this option should not be set as the automatic
negotiation phase in the SMB protocol takes care of choosing
the appropriate protocol.</para>
the appropriate protocol.</para>
</description>
<related>server min protocol</related>

View File

@ -26,7 +26,7 @@
<listitem><para>uid of user or gid of group</para></listitem>
</itemizedlist>
<para>The type of query can be one of :</para>
<para>The type of query can be one of:</para>
<itemizedlist>
<listitem><para>1 - user quotas</para></listitem>