More fixups.

(This used to be commit fbcea7ca3f89e298bec36b16f9aa7bc650440302)

diff --git a/docs/smbdotconf/filename/vetofiles.xml b/docs/smbdotconf/filename/vetofiles.xml
index 9115da6f7c69b5f3caba0f733b6e1d15819839e8..637e82449f0d754a31564591ab4ac2a840664253 100644 (file)
--- a/docs/smbdotconf/filename/vetofiles.xml
+++ b/docs/smbdotconf/filename/vetofiles.xml
@@ -27,14 +27,11 @@
        <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>
-</description>
-<related>hide files</related>
-<related>case sensitive</related>
 
-<value type="default"><comment>No files or directories are vetoed.</comment></value>
-
-<value type="example">
-; Veto any files containing the word Security, 
+       <para>
+       Examples of use include:
+<screen>
+; Veto any files containing the word Security,
 ; any ending in .tmp, and any directory containing the
 ; word root.
 veto files = /*Security*/*.tmp/*root*/
@@ -42,5 +39,12 @@ veto files = /*Security*/*.tmp/*root*/
 ; Veto the Apple specific files that a NetAtalk server
 ; creates.
 veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
-</value>
+</screen>
+       </para>
+
+</description>
+<related>hide files</related>
+<related>case sensitive</related>
+
+<value type="default">No files or directories are vetoed.</value>
 </samba:parameter>

diff --git a/docs/smbdotconf/filename/vetooplockfiles.xml b/docs/smbdotconf/filename/vetooplockfiles.xml
index a8b27977964c8fbc94a7ec69a56b9b27aae0edcb..b5ef0df5a6ec73fd6ffcf0a334ec7ada8195ae13 100644 (file)
--- a/docs/smbdotconf/filename/vetooplockfiles.xml
+++ b/docs/smbdotconf/filename/vetooplockfiles.xml
@@ -19,7 +19,13 @@
        To cause Samba not to grant oplocks on these files you would use 
        the line (either in the [global] section or in the section for 
        the particular NetBench share :</para>
+
+       <para>
+       An example of use is:
+<screen>
+veto oplock files = /.*SEM/
+</screen>
+       </para>
 </description>
 <value type="default"><comment>No files are vetoed for oplock grants</comment></value>
-<value type="example">/.*SEM/</value>
 </samba:parameter>

diff --git a/docs/smbdotconf/printing/lprmcommand.xml b/docs/smbdotconf/printing/lprmcommand.xml
index 3b2c20d478a227426db675bfb3ee917aeef579b1..f98825348a9e9f6bf31dd3769cee1c66c61a5261 100644 (file)
--- a/docs/smbdotconf/printing/lprmcommand.xml
+++ b/docs/smbdotconf/printing/lprmcommand.xml
@@ -18,10 +18,19 @@
     path in the <parameter moreinfo="none">lprm command</parameter> as the PATH may not be 
     available to the server.</para>
 
+       <para>
+       Examples of use are:
+<screen>
+lprm command = /usr/bin/lprm -P%p %j
+
+or
+
+lprm command = /usr/bin/cancel %p-%j
+</screen>
+       </para>
+
 </description>
 <related>printing</related>
 
-<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>
+<value type="default"> determined by printing parameter</value>
 </samba:parameter>

diff --git a/docs/smbdotconf/security/passdbbackend.xml b/docs/smbdotconf/security/passdbbackend.xml
index d8fc6cd48810cb8ccec18939f5f0cea400c5d9f9..74f26b89ea13289ac2f75c4dc7d1bedf167fea94 100644 (file)
--- a/docs/smbdotconf/security/passdbbackend.xml
+++ b/docs/smbdotconf/security/passdbbackend.xml
@@ -63,16 +63,27 @@
                </para></listitem>
 
        </itemizedlist>
+
     </para>
-</description>
+       Examples of use are:
+<screen>
+passdb backend = tdbsam:/etc/samba/private/passdb.tdb \
+    smbpasswd:/etc/samba/smbpasswd
 
-<value type="default">smbpasswd</value>
+or
+
+passdb backend = ldapsam:ldaps://ldap.example.com
 
-<value type="example">tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd</value>
+or
 
-<value type="example">ldapsam:ldaps://ldap.example.com</value>
+passdb backend = ldapsam:"ldap://ldap-1.example.com \
+    ldap://ldap-2.example.com"
 
-<value type="example">ldapsam:"ldap://ldap-1.example.com ldap://ldap-2.example.com"</value>
+or
 
-<value type="example">mysql:my_plugin_args tdbsam</value>
+passdb backend = mysql:my_plugin_args tdbsam
+</screen>
+</description>
+
+<value type="default">smbpasswd</value>
 </samba:parameter>

diff --git a/docs/smbdotconf/security/restrictanonymous.xml b/docs/smbdotconf/security/restrictanonymous.xml
index dad6846cee7eb5a2a9882d693f9603b09b6ab241..a7aaa31b0b2bacb8926b987a0c1dee057e690050 100644 (file)
--- a/docs/smbdotconf/security/restrictanonymous.xml
+++ b/docs/smbdotconf/security/restrictanonymous.xml
@@ -7,9 +7,12 @@
     <para>The setting of this parameter determines whether user and
     group list information is returned for an anonymous connection.
     and mirrors the effects of the
-    <constant>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\LSA\RestrictAnonymous</constant> registry key in Windows
-    2000 and Windows NT.  When set to 0, user and group list
-    information is returned to anyone who asks.  When set
+<screen>
+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\
+           Control\LSA\RestrictAnonymous
+</screen>
+       registry key in Windows 2000 and Windows NT.  When set to 0, user
+       and group list information is returned to anyone who asks.  When set
     to 1, only an authenticated user can retrive user and
     group list information.  For the value 2, supported by
     Windows 2000/XP and Samba, no anonymous connections are allowed at

diff --git a/docs/smbdotconf/security/smbpasswdfile.xml b/docs/smbdotconf/security/smbpasswdfile.xml
index 021aaf79e818025b68fb2ad11def9c89eff04b5d..b21da8e1ae0b6a63e1d1d97685c051d25e9aa76a 100644 (file)
--- a/docs/smbdotconf/security/smbpasswdfile.xml
+++ b/docs/smbdotconf/security/smbpasswdfile.xml
@@ -6,8 +6,14 @@
 <description>
     <para>This option sets the path to the encrypted smbpasswd file. By
     default the path to the smbpasswd file  is compiled into Samba.</para>
+
+       <para>
+       An example of use is:
+<screen>
+smb passwd file = /etc/samba/smbpasswd
+</screen>
+       </para>
 </description>
 
 <value type="default">${prefix}/private/smbpasswd</value>
-<value type="example">/etc/samba/smbpasswd</value>
 </samba:parameter>

diff --git a/docs/smbdotconf/security/usernamemap.xml b/docs/smbdotconf/security/usernamemap.xml
index 1ac393393bd100a0d8039994a68026d7ac51df30..1c76d317111e36f340e5cb84d758e1ffd8da902f 100644 (file)
--- a/docs/smbdotconf/security/usernamemap.xml
+++ b/docs/smbdotconf/security/usernamemap.xml
@@ -110,8 +110,14 @@ guest = *
     to the fully qualified username (i.e. DOMAIN\user) only
     after the user has been successfully authenticated.
     </para>
+
+       <para>
+       An example of use is:
+<screen>
+username map = /usr/local/samba/lib/users.map
+</screen>
+       </para>
 </description>
 
 <value type="default"><comment>no username map</comment></value>
-<value type="example">/usr/local/samba/lib/users.map</value>
 </samba:parameter>