summaryrefslogtreecommitdiff
path: root/docs/smbdotconf
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-07-06 01:04:05 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:02 -0500
commit082104fec0509ec49f4cde9c87872f80434fb490 (patch)
tree99f25645c36bc0904e1ca77ff290986651c1399f /docs/smbdotconf
parent0ab658f4491f3d96ad804682f9f35c30f5ea85ea (diff)
downloadsamba-082104fec0509ec49f4cde9c87872f80434fb490.tar.gz
samba-082104fec0509ec49f4cde9c87872f80434fb490.tar.bz2
samba-082104fec0509ec49f4cde9c87872f80434fb490.zip
More formatting edits.
(This used to be commit 962cb93b8c17bfc93cb6c8634d6eb47bbc271569)
Diffstat (limited to 'docs/smbdotconf')
-rw-r--r--docs/smbdotconf/filename/hidefiles.xml13
-rw-r--r--docs/smbdotconf/printing/lprmcommand.xml2
-rw-r--r--docs/smbdotconf/security/passdbbackend.xml4
-rw-r--r--docs/smbdotconf/tuning/keepalive.xml2
4 files changed, 14 insertions, 7 deletions
diff --git a/docs/smbdotconf/filename/hidefiles.xml b/docs/smbdotconf/filename/hidefiles.xml
index 9246e8e119..461df419f1 100644
--- a/docs/smbdotconf/filename/hidefiles.xml
+++ b/docs/smbdotconf/filename/hidefiles.xml
@@ -21,6 +21,12 @@
<para>Setting this parameter will affect the performance of Samba,
as it will be forced to check all files and directories for a match
as they are scanned.</para>
+
+ <para>
+ The example shown above is based on files that the Macintosh
+ SMB client (DAVE) available from <ulink url="http://www.thursby.com">
+ Thursby</ulink> creates for internal use, and also still hides
+ all files beginning with a dot.</para>
</description>
<related>hide dot files</related>
@@ -28,10 +34,7 @@
<related>case sensitive</related>
<value type="default"><comment>no file are hidden</comment></value>
-<value type="example">/.*/DesktopFolderDB/TrashFor%m/resource.frk/<comment>
-The above example is based on files that the Macintosh
-SMB client (DAVE) available from <ulink url="http://www.thursby.com">
-Thursby</ulink> creates for internal use, and also still hides
-all files beginning with a dot.</comment></value>
+
+<value type="example">/.*/DesktopFolderDB/TrashFor%m/resource.frk/</value>
</samba:parameter>
diff --git a/docs/smbdotconf/printing/lprmcommand.xml b/docs/smbdotconf/printing/lprmcommand.xml
index 26342d7b07..3b2c20d478 100644
--- a/docs/smbdotconf/printing/lprmcommand.xml
+++ b/docs/smbdotconf/printing/lprmcommand.xml
@@ -21,7 +21,7 @@
</description>
<related>printing</related>
-<value type="default"><comment>depends on the setting of <parameter moreinfo="none">printing</parameter></comment></value>
+<value type="default">depends on the setting of <parameter moreinfo="none">printing</parameter></value>
<value type="example">/usr/bin/lprm -P%p %j</value>
<value type="example">/usr/bin/cancel %p-%j</value>
</samba:parameter>
diff --git a/docs/smbdotconf/security/passdbbackend.xml b/docs/smbdotconf/security/passdbbackend.xml
index 523d98a521..d8fc6cd488 100644
--- a/docs/smbdotconf/security/passdbbackend.xml
+++ b/docs/smbdotconf/security/passdbbackend.xml
@@ -67,8 +67,12 @@
</description>
<value type="default">smbpasswd</value>
+
<value type="example">tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd</value>
+
<value type="example">ldapsam:ldaps://ldap.example.com</value>
+
<value type="example">ldapsam:"ldap://ldap-1.example.com ldap://ldap-2.example.com"</value>
+
<value type="example">mysql:my_plugin_args tdbsam</value>
</samba:parameter>
diff --git a/docs/smbdotconf/tuning/keepalive.xml b/docs/smbdotconf/tuning/keepalive.xml
index 8eef0d0c5b..5648253478 100644
--- a/docs/smbdotconf/tuning/keepalive.xml
+++ b/docs/smbdotconf/tuning/keepalive.xml
@@ -11,7 +11,7 @@
a client is still present and responding.</para>
<para>Keepalives should, in general, not be needed if the socket
- being used has the SO_KEEPALIVE attribute set on it (see <link linkend="SOCKETOPTIONS">
+ has the SO_KEEPALIVE attribute set on it by default. (see <link linkend="SOCKETOPTIONS">
<parameter moreinfo="none">socket options</parameter></link>).
Basically you should only use this option if you strike difficulties.</para>
</description>