Git commit 9e9c136bd782f7e2bc7598902fc424f4b2359e1e by Gilles Caulier.
Committed on 27/09/2016 at 19:22.
Pushed by cgilles into branch 'master'.

apply new Wolfgang patch to fix Setup Chapter

M  +17   -13   digikam/using-setup-album.docbook
M  +1    -1    digikam/using-setup-collections.docbook
M  +2    -2    digikam/using-setup-database.docbook

http://commits.kde.org/digikam-doc/9e9c136bd782f7e2bc7598902fc424f4b2359e1e

diff --git a/digikam/using-setup-album.docbook 
b/digikam/using-setup-album.docbook
index 80b0dbd..a0eefe9 100644
--- a/digikam/using-setup-album.docbook
+++ b/digikam/using-setup-album.docbook
@@ -1,5 +1,9 @@
 <sect2 id="using-setup-album">
-    <title>Album Settings</title>
+    <title>Album View Settings</title>
+
+    <para>
+        In a number of tabs you can access the following groups of settings 
for the Album View:
+    </para>
 
     <sect3 id="using-setup-album-iconview">
         <title>Icon-View Settings</title>
@@ -11,31 +15,31 @@
         </para>
 
         <para>
-            The first series of settings on the left side of this view permit 
to customize the technical information to show below the album icon-view 
thumbnail, as the filename, the file size, the creation date, the image 
dimensions, and the aspect ratio.
+            The first series of settings on the left side of this view permit 
to customize the technical information to show below the album icon thumbnail, 
as the filename, the file size, the creation date, the image dimensions, and 
the aspect ratio.
         </para>
 
         <para>
-            Note that <guilabel>Show file modification date</guilabel> option 
show the file modification date only if it's different than <guilabel>Show 
camera creation date</guilabel>. This option is useful to identify quickly 
which items have been modified.
+            Note that the <guilabel>Show file modification date</guilabel> 
option shows the file modification date only if it's different from the 
creation date. This function is useful to identify quickly which items have 
been modified.
         </para>
 
         <para>
-            On the right side, the options permit to customize other 
properties to show over and below the album icon-view thumbnail, as the file 
mime-type, the title, the caption, and the labels.
+            On the right side, the options permit to customize other 
properties to show over and below the album icon thumbnail, as the file 
mime-type, the title, the caption, and the labels.
         </para>
 
         <para>
-            The <guilabel>Show rotation overlay buttons</guilabel> option show 
overlay buttons over the image thumbnail to be able to process left or right 
image rotation.
+            The <guilabel>Show rotation overlay buttons</guilabel> option 
shows overlay buttons over the image thumbnail to be able to process left or 
right image rotation.
         </para>
 
         <para>
-            The <guilabel>Show fullscreen overlay button</guilabel> option 
show an overlay button over the image thumbnail to open it in fullscreen mode.
+            The <guilabel>Show fullscreen overlay button</guilabel> option 
shows an overlay button over the image thumbnail to open it in fullscreen mode.
         </para>
 
         <para>
-            The <guilabel>Show Geolocation Indicator</guilabel> option show an 
icon over the image thumbnail if item has geolocation information.
+            The <guilabel>Show Geolocation Indicator</guilabel> option shows 
an icon over the image thumbnail if the item has geolocation information.
         </para>
 
         <para>
-            An example of album icon-view item is given below:
+            An example of an album icon is given below:
         </para>
 
         <para>
@@ -49,15 +53,15 @@
         </para>
 
         <para>
-            The <guilabel>Thumbnail click action</guilabel> option permit to 
choose what should happen when you click on a thumbnail. Two settings are 
avaialble: <guilabel>Show embedded view</guilabel> to display image in preview 
mode (F3) or <guilabel>Start image editor</guilabel> to open image in a 
separated window (F4).
+            The <guilabel>Thumbnail click action</guilabel> option permits to 
choose what should happen when you click on a thumbnail. Two settings are 
avaialble: <guilabel>Show embedded view</guilabel> to display image in preview 
mode (F3) or <guilabel>Start image editor</guilabel> to open image in a 
separated window (F4).
         </para>
 
         <para>
-            The <guilabel>Icon View font</guilabel> option permit to select 
the font used to display text in icon-views.
+            The <guilabel>Icon View font</guilabel> option permits to select 
the font used to display text in icon-views.
         </para>
 
         <para>
-            The <guilabel>Use large thumbnail size for high screen 
resolution</guilabel> option render icon-view with large thumbnail size, for 
example in case of 4K monitor is used. By default this option is turned off and 
the maximum thumbnail size is limited to 256x256 pixels. When this option is 
enabled, thumbnail size can be extended to 512x512 pixels. This option will 
store more data in thumbnail database and will use more system memory. 
&digikam; needs to be restarted to take effect, and <link 
linkend="tool-maintenance-features-thumbs">Rebuild Thumbnails</link> option 
from Maintenance tool needs to be processed over whole collections.
+            The <guilabel>Use large thumbnail size for high screen 
resolution</guilabel> option renders the icon-view with large thumbnail size, 
for example in case of 4K monitor is used. By default this option is turned off 
and the maximum thumbnail size is limited to 256 x 256 pixels. When this option 
is enabled, thumbnail size can be extended to 512 x 512 pixels. This option 
will store more data in thumbnail database and will use more system memory. 
&digikam; needs to be restarted for the option to take effect and the <link 
linkend="tool-maintenance-features-thumbs">Rebuild Thumbnails</link> option 
from the Maintenance tool needs to be processed over all collections.
         </para>
 
     </sect3>
@@ -66,7 +70,7 @@
         <title>Folder View Settings</title>
 
         <para>
-            These settings permit to customize the album tree-view. The 
<guilabel>Tree View thumbnail size</guilabel> option configure the size in 
pixels of the Tree View thumbnails in &digikam;'s sidebars. Use large value for 
HiDPI screen. The <guilabel>Tree View font</guilabel> option set the font used 
to display text in Tree Views. The option <guilabel>Show a count of items in 
Tree Views</guilabel> will display along the album name the number of icon-view 
items inside.
+            These settings permit to customize the album tree-view of the Left 
Sidebar. The <guilabel>Tree View thumbnail size</guilabel> option configures 
the size in pixels of the Tree View thumbnails in &digikam;'s sidebars. Use 
large value for HiDPI screen. The <guilabel>Tree View font</guilabel> option 
sets the font used to display text in Tree Views. The option <guilabel>Show a 
count of items in Tree Views</guilabel> will display along the album name the 
number of icon-view items inside.
         </para>
 
         <para>
@@ -81,7 +85,7 @@
         <title>Album View Preview Settings</title>
 
         <para>
-            Instead to open the image in editor, the &digikam; preview mode 
(<keycap>F3</keycap>) will embedded the large image view inside the main 
window. The goal to this view is to be faster than image editor, to be able to 
review the list of current images quickly. Depending of your computer features, 
you can customize the better way to load image to preview. Raw files can be 
processed differently, as this kind of container can require long computation.
+            Instead of opening the image in the editor, the &digikam; preview 
mode (<keycap>F3</keycap>) will embedded the large image view inside the main 
window. The goal to this view is to be faster than image editor, to be able to 
review the list of current images quickly. Depending of your computer features, 
you can customize the better way to load image to preview. Raw files can be 
processed differently, as this kind of container can require long computation.
         </para>
 
         <para>
diff --git a/digikam/using-setup-collections.docbook 
b/digikam/using-setup-collections.docbook
index 2d81a85..9928538 100644
--- a/digikam/using-setup-collections.docbook
+++ b/digikam/using-setup-collections.docbook
@@ -2,7 +2,7 @@
     <title>Collections Settings</title>
 
     <para>
-        This dialog manages your Collection types. Album Collections are 
described in detail in the <link 
linkend="using-mainwindow-albumsview">Albums</link> section.
+        This dialog manages your Album Collections. Each Collection represents 
a root folder containing your photographs or videos. Usually the root folder 
will contain sub folders. All these folders we call Albums. How to work with 
them, create, delete, rename them &etc; is described in detail in the <link 
linkend="using-mainwindow-albumsview">Albums View</link> section.
     </para>
 
     <para>
diff --git a/digikam/using-setup-database.docbook 
b/digikam/using-setup-database.docbook
index 7c69f42..84cffe3 100644
--- a/digikam/using-setup-database.docbook
+++ b/digikam/using-setup-database.docbook
@@ -13,7 +13,7 @@
         <title>The Sqlite Database</title>
 
         <para>
-            <ulink url="https://sqlite.org";>SQLite</ulink> is a relational 
database management system, contained in C programming library. SQLite is not 
directly comparable to client/server SQL database engines such as MySQL, Oracle 
or PostgreSQL. Rather, it is an embedded SQL database engine, &ie; it is 
embedded in an end program. SQLite reads and writes directly to ordinary disk 
files. For device-local storage with low writer concurrency and less than a 
terabyte of content, SQLite is almost always a better solution. SQLite is fast 
and reliable and it requires no configuration or maintenance. It keeps things 
simple. SQLite "just works".
+            <ulink url="https://sqlite.org";>SQLite</ulink> is a relational 
database management system, contained in C programming library. SQLite is not 
directly comparable to client/server SQL database engines such as MySQL, Oracle 
or PostgreSQL. Rather, it is an embedded SQL database engine, &ie; it is 
embedded in an end program. SQLite reads and writes directly to ordinary disk 
files. For device-local storage with low writer concurrency and less than a 
terabyte of content, SQLite is almost always a better solution. SQLite is fast 
and reliable and it requires no configuration or maintenance. It keeps thing 
simple. SQLite "just works".
         </para>
 
         <para>
@@ -38,7 +38,7 @@
         </para>
 
         <para>
-            To make your application run fast and smoothly, it is recommended 
to check and optimize your databases once in awhile. This could be achieved 
using sqlite3 packages or sqlite browser (high quality, easy to use visual tool 
for managing database objects). For Ubuntu and its derivatives, it could be 
retrieved using <command>sudo apt-get install sqlite3</command> or 
<command>sudo apt-get install sqlitebrowser</command>. Now all remains is to 
open the terminal, switch to the directory where databases are stored.
+            To make your application run fast and smoothly, it is recommended 
to check and optimize your databases once in awhile. This could be achieved 
using sqlite3 packages or sqlite browser (high quality, easy to use visual tool 
for managing database objects). For Ubuntu and its derivatives, it could be 
retrieved using <command>sudo apt-get install sqlite3</command> or 
<command>sudo apt-get install sqlitebrowser</command>. Now all remains is to 
open the terminal, switch to the directory where databases and stored.
         </para>
 
         <note><para>

Reply via email to