summaryrefslogtreecommitdiff
path: root/docs-xml/manpages-3
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-06-27 13:06:50 +0200
committerBjoern Jacke <bj@sernet.de>2012-06-28 21:19:17 +0200
commitf6ac6b8f3c40c99e7bc43d88ec5a2d95ecfc97a4 (patch)
tree8391f3f4d82ca742328089eb839e5522b08a7f39 /docs-xml/manpages-3
parent11fc75fcb515b27cacf2f703c58c6ef10b645fee (diff)
downloadsamba-f6ac6b8f3c40c99e7bc43d88ec5a2d95ecfc97a4.tar.gz
samba-f6ac6b8f3c40c99e7bc43d88ec5a2d95ecfc97a4.tar.bz2
samba-f6ac6b8f3c40c99e7bc43d88ec5a2d95ecfc97a4.zip
docs-xml: fix typos and format in smb.conf server max protocol man
Diffstat (limited to 'docs-xml/manpages-3')
-rw-r--r--docs-xml/manpages-3/net.8.xml32
1 files changed, 28 insertions, 4 deletions
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index f20afb29f4..c85f87fae7 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -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>