Git commit c5b4f5e40aaacf501269670fd7e99ce4aadb5ead by Gilles Caulier.
Committed on 02/09/2016 at 16:01.
Pushed by cgilles into branch 'master'.

implement DK Setup/Mics General section

M  +1    -1    TODO
M  +14   -4    digikam/using-setup-misc.docbook
A  +-    --    digikam/using-setup-misc.png

http://commits.kde.org/digikam-doc/c5b4f5e40aaacf501269670fd7e99ce4aadb5ead

diff --git a/TODO b/TODO
index 5af953a..fde540b 100644
--- a/TODO
+++ b/TODO
@@ -133,7 +133,7 @@ using-setup-mimetype.docbook
 using-setup-theme.docbook
 using-setup-cm.docbook                                                         
                    Add sections about Profiles and Advanced tabs
 using-setup-intro.docbook                  DONE            DONE               
Gilles
-using-setup-misc.docbook
+using-setup-misc.docbook                   DONE            DONE               
Gilles
 using-setup-misc-behavior.docbook
 using-setup-tooltip.docbook                DONE            DONE               
Gilles
 using-setup-collections.docbook 
diff --git a/digikam/using-setup-misc.docbook b/digikam/using-setup-misc.docbook
index 63b50af..46ee0a3 100644
--- a/digikam/using-setup-misc.docbook
+++ b/digikam/using-setup-misc.docbook
@@ -1,19 +1,29 @@
 <sect2 id="using-setup-misc">
     <title>Miscellaneous Settings</title>
 
-    <sect3 id="using-setup-misc-General">
+    <sect3 id="using-setup-misc-general">
         <title>General Settings</title>
 
         <para>
-            With the <guilabel>Confirm when moving items to trash</guilabel> 
setting you can set the verbosity of &digikam; when you delete a photograph or 
an Album. See <link linkend="using-deleteimage">Deleting a Photograph</link> 
and <link linkend="using-deletealbum">Deleting an Album</link> sections for 
more details.
+            <inlinemediaobject><imageobject>
+                <imagedata fileref="&path;using-setup-misc.png" format="PNG" />
+            </imageobject></inlinemediaobject>
         </para>
 
         <para>
-            The editorial changes done through the right sidebar can be 
quietly applied by &digikam; when setting the <guilabel>Apply changes in the 
right sidebar without confirmation</guilabel> option. Otherwise the changes 
must be applied by pressing the <guilabel>Apply changes</guilabel> button.
+            With the <guilabel>String comparison type</guilabel> setting, you 
can sets the way in which strings are compared inside &digikam;.
+            This influences the sorting of the tree views. 
<guilabel>Natural</guilabel> tries to compare strings in a way that regards 
some 
+            normal conventions. The result will be sort naturally even if they 
have a different number of digits inside. 
+            <guilabel>Normal</guilabel> uses a more technical approach. Use 
this style if you want to entitle albums with 
+            ISO dates (201006 or 20090523) and the albums should be sorted 
according to these dates.
         </para>
 
         <para>
-            You can also switch off the display of the splash screen when 
&digikam; loads. This may speed up the start time of &digikam; slightly.
+            With the <guilabel>Confirm when moving items to trash</guilabel> 
and <guilabel>Confirm when permanently deleting items</guilabel> settings you 
can set the verbosity of &digikam; when you delete a photograph or an Album. 
See <link linkend="using-deleteimage">Deleting a Photograph</link> and <link 
linkend="using-deletealbum">Deleting an Album</link> sections for more details.
+        </para>
+
+        <para>
+            The editorial changes done through the right sidebar can be 
quietly applied by &digikam; when setting the <guilabel>Apply changes in the 
right sidebar without confirmation</guilabel> option. Otherwise the changes 
must be applied by pressing the <guilabel>Apply changes</guilabel> button.
         </para>
 
         <anchor id="rescan-items" />
diff --git a/digikam/using-setup-misc.png b/digikam/using-setup-misc.png
new file mode 100644
index 0000000..8d790fe
Binary files /dev/null and b/digikam/using-setup-misc.png differ

Reply via email to