From f6ac6b8f3c40c99e7bc43d88ec5a2d95ecfc97a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Baumbach?= Date: Wed, 27 Jun 2012 13:06:50 +0200 Subject: [PATCH] docs-xml: fix typos and format in smb.conf server max protocol man --- docs-xml/manpages-3/net.8.xml | 32 +++++++++++++++++++--- docs-xml/smbdotconf/misc/ncalrpcdir.xml | 10 +++---- docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 32 ++++++++++++---------- docs-xml/smbdotconf/vfs/getquotacommand.xml | 2 +- 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml index f20afb29f4a..c85f87fae76 100644 --- a/docs-xml/manpages-3/net.8.xml +++ b/docs-xml/manpages-3/net.8.xml @@ -1988,10 +1988,34 @@ string. REGISTRY IMPORT <replaceable>file</replaceable><!-- - --><replaceable>[opt]</replaceable> - - Import a registration entries (.reg) file. - + --> [--precheck <check-file>] [opt] + Import a registration entries (.reg) file. + The following options are available: + + --precheck check-file + + 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. + + + The check-file follows the normal registry file syntax with the + following semantics: + + + <value name>=<value> checks whether the + value exists and has the given value. + <value name>=- checks whether the value does + not exist. + [key] checks whether the key exists. + + [-key] checks whether the key does not exist. + + + + + diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml b/docs-xml/smbdotconf/misc/ncalrpcdir.xml index b53acef9e26..01b5b5cc5c3 100644 --- a/docs-xml/smbdotconf/misc/ncalrpcdir.xml +++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml @@ -1,11 +1,11 @@ + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - This directory will hold a series of named pipes to allow RPC over inter-process communication. . - 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 + This directory will hold a series of named pipes to allow RPC over inter-process communication. + 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 ${prefix}/var/ncalrpc diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml index 5eb79f3502c..f91523b5960 100644 --- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml @@ -1,8 +1,8 @@ + context="G" + type="enum" + developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> The value of the parameter (a string) is the highest protocol level that will be supported by the server. @@ -20,9 +20,8 @@ - LANMAN1: First - modern version of the protocol. Long filename - support. + LANMAN1: First modern + version of the protocol. Long filename support. @@ -33,39 +32,42 @@ NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS. + SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available. - SMB2_02: The earliest SMB2 version. + SMB2_02: The earliest SMB2 version. - SMB2_10: Windows 7 SMB2 version. + SMB2_10: Windows 7 SMB2 version. - SMB2_22: Early Windows 8 SMB2 version. + SMB2_22: Early Windows 8 SMB2 version. - SMB2_24: Windows 8 beta SMB2 version. + SMB2_24: Windows 8 beta SMB2 version. - By default SMB2 selects the SMB2_02 varient. + By default SMB2 selects the SMB2_02 variant. + + SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available. - SMB3_00: Windows 8 SMB3 version. (mostly the same as SMB2_24) + SMB3_00: Windows 8 SMB3 version. (mostly the same as SMB2_24) - By default SMB3 selects the SMB3_00 varient. + By default SMB3 selects the SMB3_00 variant. Normally this option should not be set as the automatic negotiation phase in the SMB protocol takes care of choosing - the appropriate protocol. + the appropriate protocol. server min protocol diff --git a/docs-xml/smbdotconf/vfs/getquotacommand.xml b/docs-xml/smbdotconf/vfs/getquotacommand.xml index 92016ef46c7..04f30344f1f 100644 --- a/docs-xml/smbdotconf/vfs/getquotacommand.xml +++ b/docs-xml/smbdotconf/vfs/getquotacommand.xml @@ -26,7 +26,7 @@ uid of user or gid of group - The type of query can be one of : + The type of query can be one of: 1 - user quotas -- 2.11.4.GIT