Fix ambiguity and erroneous info regarding name mangling and case preservation parame...

(This used to be commit c3fb48c27a9c03795a03b79fd4bad1c6020f89ad)

diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml
index 94539a29ab3e7f04300f11b9762901b633b86908..7fe97fc4f4e76bab18c13eb11b8a99ed6016b253 100644 (file)
--- a/docs/manpages-3/smb.conf.5.xml
+++ b/docs/manpages-3/smb.conf.5.xml
@@ -595,7 +595,7 @@ chmod 1770 /usr/local/samba/lib/usershares
        </para>
 
        <para>
-       All of these options can be set separately for each service (or globally, of course).
+       These options can be set separately for each service.
        </para>
 
        <para>

diff --git a/docs/smbdotconf/filename/defaultcase.xml b/docs/smbdotconf/filename/defaultcase.xml
index ac5f589d3a144e414c7f5c23b83d53ccef9b1383..1efb37c8b5909270b2d2a1a8f4d20bdeeddbfae6 100644 (file)
--- a/docs/smbdotconf/filename/defaultcase.xml
+++ b/docs/smbdotconf/filename/defaultcase.xml
@@ -2,8 +2,8 @@
        context="S"
        type="string" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>See the section on <smbconfoption name="name mangling"/>
-               . Also note the <smbconfoption name="short preserve case"/> parameter.</para>
+       <para>See the section on <smbconfoption name="name mangling"/>.
+       Also note the <smbconfoption name="short preserve case"/> parameter.</para>
 </description>
 <value type="default">lower</value>
 </samba:parameter>

diff --git a/docs/smbdotconf/filename/shortpreservecase.xml b/docs/smbdotconf/filename/shortpreservecase.xml
index 5a164c3d48b5ba9a91baf6ed634a660322922e79..90188a076ecc0c64de49b3105749d729141677c3 100644 (file)
--- a/docs/smbdotconf/filename/shortpreservecase.xml
+++ b/docs/smbdotconf/filename/shortpreservecase.xml
@@ -3,13 +3,12 @@
                                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>This boolean parameter controls if new files 
-       which conform to 8.3 syntax, that is all in upper case and of 
-       suitable length, are created upper case, or if they are forced 
-       to be the <smbconfoption name="default case"/>
-       . This  option can be use with <smbconfoption name="preserve case">yes</smbconfoption>
-        to permit long filenames to retain their case, while short 
-       names are lowered. </para>
+       <para>
+       This boolean parameter controls if new files which conform to 8.3 syntax, that is all in upper case and of
+       suitable length, are created upper case, or if they are forced to be the <smbconfoption name="default case"/>.
+       This  option can be use with <smbconfoption name="preserve case">yes</smbconfoption> to permit long filenames
+       to retain their case, while short names are lowered.
+       </para>
                
        <para>See the section on <link linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
 </description>