diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2012-10-19 08:33:31 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2012-10-19 08:33:31 +0200 |
commit | 47902702b3e6390de05f8fca2bc457936af9f5c1 (patch) | |
tree | 753d16520120953a54bedae8cb197f7d0672bfac /docs-xml/smbdotconf | |
parent | aad30c062fd176fa15994a44a0178d51764cdbf7 (diff) | |
download | samba-47902702b3e6390de05f8fca2bc457936af9f5c1.tar.gz samba-47902702b3e6390de05f8fca2bc457936af9f5c1.tar.bz2 samba-47902702b3e6390de05f8fca2bc457936af9f5c1.zip |
smb.conf(5): Fix mixing of tabs and spaces.
Diffstat (limited to 'docs-xml/smbdotconf')
-rw-r--r-- | docs-xml/smbdotconf/base/serverservices.xml | 13 | ||||
-rw-r--r-- | docs-xml/smbdotconf/domain/dnsupdatecommand.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/domain/nsupdatecommand.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/domain/rndccommand.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/domain/spnupdatecommand.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/misc/afstokenlifetime.xml | 15 | ||||
-rw-r--r-- | docs-xml/smbdotconf/protocol/serverminprotocol.xml | 8 | ||||
-rw-r--r-- | docs-xml/smbdotconf/security/lognttokencommand.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/security/sambakcccommand.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/security/tlsenabled.xml | 4 | ||||
-rw-r--r-- | docs-xml/smbdotconf/vfs/ntvfshandler.xml | 2 | ||||
-rw-r--r-- | docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 |
12 files changed, 28 insertions, 28 deletions
diff --git a/docs-xml/smbdotconf/base/serverservices.xml b/docs-xml/smbdotconf/base/serverservices.xml index 8ea28e2611..503938af6f 100644 --- a/docs-xml/smbdotconf/base/serverservices.xml +++ b/docs-xml/smbdotconf/base/serverservices.xml @@ -1,15 +1,16 @@ <samba:parameter name="server services" context="G" - type="list" + type="list" advanced="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This option contains the services that the Samba daemon will run.</para> + <para>This option contains the services that the Samba daemon will + run.</para> - <para>An entry in the <filename>smb.conf</filename> file can either override - the previous value completely or entries can be removed from or added to it - by prefixing them with <constant>+</constant> or <constant>-</constant>. - </para> + <para>An entry in the <filename>smb.conf</filename> file can either + override the previous value completely or entries can be removed from + or added to it by prefixing them with <constant>+</constant> or + <constant>-</constant>. </para> </description> <value type="default">s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate dns</value> diff --git a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml index b8160abb44..08ff90acdf 100644 --- a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml +++ b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml @@ -1,6 +1,6 @@ <samba:parameter name="dns update command" context="G" - type="string" + type="string" advanced="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/domain/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml index 0ad3f5ce52..3cf02f1235 100644 --- a/docs-xml/smbdotconf/domain/nsupdatecommand.xml +++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml @@ -1,6 +1,6 @@ <samba:parameter name="nsupdate command" context="G" - type="string" + type="string" advanced="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/domain/rndccommand.xml b/docs-xml/smbdotconf/domain/rndccommand.xml index f22ea1fdb9..b407ff29cb 100644 --- a/docs-xml/smbdotconf/domain/rndccommand.xml +++ b/docs-xml/smbdotconf/domain/rndccommand.xml @@ -1,6 +1,6 @@ <samba:parameter name="rndc command" context="G" - type="string" + type="string" advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/domain/spnupdatecommand.xml b/docs-xml/smbdotconf/domain/spnupdatecommand.xml index 2585a58b81..f63be84b9e 100644 --- a/docs-xml/smbdotconf/domain/spnupdatecommand.xml +++ b/docs-xml/smbdotconf/domain/spnupdatecommand.xml @@ -1,6 +1,6 @@ <samba:parameter name="spn update command" context="G" - type="string" + type="string" advanced="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/misc/afstokenlifetime.xml b/docs-xml/smbdotconf/misc/afstokenlifetime.xml index 25887385c5..cbf9574223 100644 --- a/docs-xml/smbdotconf/misc/afstokenlifetime.xml +++ b/docs-xml/smbdotconf/misc/afstokenlifetime.xml @@ -1,13 +1,12 @@ <samba:parameter name="afs token lifetime" - context="G" - type="integer" - advanced="1" - xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> + context="G" + type="integer" + advanced="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This parameter controls the lifetime of tokens that the AFS fake-kaserver claims. - In reality these never expire but this lifetime controls when the afs client - will forget the token. - </para> + <para>This parameter controls the lifetime of tokens that the AFS + fake-kaserver claims. In reality these never expire but this lifetime + controls when the afs client will forget the token. </para> <para>Set this parameter to 0 to get <constant>NEVERDATE</constant>.</para> </description> diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml index feab2182df..4edecc45c4 100644 --- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml +++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml @@ -1,16 +1,16 @@ <samba:parameter name="server min protocol" context="G" type="enum" - developer="1" + developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <synonym>min protocol</synonym> <description> <para>This setting controls the minimum protocol version that the server will allow the client to use.</para> - <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> + <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> </description> <related>server max protocol</related> diff --git a/docs-xml/smbdotconf/security/lognttokencommand.xml b/docs-xml/smbdotconf/security/lognttokencommand.xml index 69703b5b2f..33ec23b810 100644 --- a/docs-xml/smbdotconf/security/lognttokencommand.xml +++ b/docs-xml/smbdotconf/security/lognttokencommand.xml @@ -1,6 +1,6 @@ <samba:parameter name="log nt token command" context="G" - type="string" + type="string" advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/security/sambakcccommand.xml b/docs-xml/smbdotconf/security/sambakcccommand.xml index 6f6ba14fc0..9621792c9f 100644 --- a/docs-xml/smbdotconf/security/sambakcccommand.xml +++ b/docs-xml/smbdotconf/security/sambakcccommand.xml @@ -1,6 +1,6 @@ <samba:parameter name="samba kcc command" context="G" - type="string" + type="string" advanced="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/security/tlsenabled.xml b/docs-xml/smbdotconf/security/tlsenabled.xml index 9bd736a5c1..106dddade6 100644 --- a/docs-xml/smbdotconf/security/tlsenabled.xml +++ b/docs-xml/smbdotconf/security/tlsenabled.xml @@ -1,8 +1,8 @@ <samba:parameter name="tls enabled" - type="boolean" + type="boolean" context="G" basic="1" - xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>If this option is set to <constant>yes</constant>, then Samba will use TLS when possible in communication.</para> diff --git a/docs-xml/smbdotconf/vfs/ntvfshandler.xml b/docs-xml/smbdotconf/vfs/ntvfshandler.xml index e9dbc3cb08..aa3bce5c0c 100644 --- a/docs-xml/smbdotconf/vfs/ntvfshandler.xml +++ b/docs-xml/smbdotconf/vfs/ntvfshandler.xml @@ -1,6 +1,6 @@ <samba:parameter name="ntvfs handler" context="S" - type="list" + type="list" advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml index e2fa5ed451..5d3605ab9e 100644 --- a/docs-xml/smbdotconf/winbind/idmapconfig.xml +++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml @@ -1,6 +1,6 @@ <samba:parameter name="idmap config:OPTION" context="G" - type="string" + type="string" advanced="1" developer="1" hide="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> |