[digikam-doc] digikam: apply big patch from Wolfgang to update digiKam main window handbook chapter with 5.x release

Gilles Caulier caulier.gilles at gmail.com
Thu Sep 15 20:43:38 UTC 2016


Git commit 13b1fed653825570e5da210718344c4b2d3754f8 by Gilles Caulier.
Committed on 15/09/2016 at 20:42.
Pushed by cgilles into branch 'master'.

apply big patch from Wolfgang to update digiKam main window handbook chapter with 5.x release

M  +2    -5    digikam/intro-firstrun.docbook
M  +7    -7    digikam/using-dam-build.docbook
A  +-    --    digikam/using-mainwindow-advancedsearchtool.png
A  +-    --    digikam/using-mainwindow-advancedsearchtool2.png
M  +-    --    digikam/using-mainwindow-advsearch.png
M  +-    --    digikam/using-mainwindow-albumproperties.png
M  +-    --    digikam/using-mainwindow-albumview.png
M  +-    --    digikam/using-mainwindow-assigntags.png
M  +-    --    digikam/using-mainwindow-dateview.png
M  +-    --    digikam/using-mainwindow-duplicates-albumsfilter.png
A  +-    --    digikam/using-mainwindow-facedetection.png
A  +-    --    digikam/using-mainwindow-facedetectiontag.png
M  +-    --    digikam/using-mainwindow-filters.png
A  +-    --    digikam/using-mainwindow-icon-showfacetags.png
M  +-    --    digikam/using-mainwindow-iconview.png
A  +-    --    digikam/using-mainwindow-labelsview.png
M  +-    --    digikam/using-mainwindow-mapsearch.png
M  +-    --    digikam/using-mainwindow-preview.png
M  +-    --    digikam/using-mainwindow-searchsimilar.png
A  +-    --    digikam/using-mainwindow-searchsketch.png
M  +-    --    digikam/using-mainwindow-searchview.png
M  +-    --    digikam/using-mainwindow-tagsview.png
M  +-    --    digikam/using-mainwindow-timeline.png
M  +-    --    digikam/using-mainwindow-toolbar.png
M  +-    --    digikam/using-mainwindow-tooltip.png
M  +311  -137  digikam/using-mainwindow.docbook
M  +1    -1    digikam/using-sidebar-captions.docbook

http://commits.kde.org/digikam-doc/13b1fed653825570e5da210718344c4b2d3754f8

diff --git a/digikam/intro-firstrun.docbook b/digikam/intro-firstrun.docbook
index cb5ce8a..5f7ec86 100644
--- a/digikam/intro-firstrun.docbook
+++ b/digikam/intro-firstrun.docbook
@@ -29,7 +29,7 @@
             </para>
 
             <para>
-                Then you have to specify a local folder that resides on your computer, in which the database will be stored. This path will be the same for all image folders.
+                Then you have to specify a local folder that resides on your computer, in which the database will be stored. This path will be the same for all image folders. For details about the database type selection have a look at <link linkend="intro-database-intro">The &digikam; Database</link>. If you have a local installation and a collection of less than 30.000 photographs you may well keep the default setting (SQLite).
             </para>
 
             <para>
@@ -108,11 +108,8 @@
                 </inlinemediaobject>
             </para>
 
-        </sect3>
-
-        <sect3> <title>The Scan Items Dialog</title>
             <para>
-                If you already have a collection of photographs on your hard disk, you can enter the top-level folder containing the photographs, this is called the Albums Library folder. &digikam; will treat each sub-folder of the folder you've entered as an Album. None of the photographs will be altered. During folders parsing you can see a progress bar in the lower right corner like this:
+                Nothing really to select here. You can cancel or start the scan with <guilabel>Finish</guilabel>. None of the photographs will be altered. During folders parsing you can see a progress bar in the lower right corner like this:
             </para>
 
             <para>
diff --git a/digikam/using-dam-build.docbook b/digikam/using-dam-build.docbook
index 6bfecfc..ad09c87 100644
--- a/digikam/using-dam-build.docbook
+++ b/digikam/using-dam-build.docbook
@@ -20,7 +20,7 @@
         </para>
 
         <para>
-            The key thing to remember is that you don't know how you or somebody else will try to find an image 2 years ahead of our time. You will remember past events in a different context, it's a fact of life. So if can narrow down your search by remembering place or time or camera or theme or rating or owner you stand an infinitely better chance to find it quickly than by just one of those criteria or none. At the beginning, at the time of taking a photograph, all metadata is in your head (except for the EXIF data). If you do not transcribe some of it into your DAM system, it will be lost eventually as much as every event fades into oblivion over time.
+            The key thing to remember is that you don't know how you or somebody else will try to find an image 2 years ahead of our time. You will remember past events in a different context, it's a fact of life. So if you can narrow down your search by remembering place or time or camera or theme or rating or owner you stand an infinitely better chance to find it quickly than by just one of those criteria or none. At the beginning, at the time of taking a photograph, all metadata is in your head (except for the EXIF data). If you do not transcribe some of it into your DAM system, it will be lost eventually as much as every event fades into oblivion over time.
         </para>
 
         <para>
@@ -32,7 +32,7 @@
     <sect3 id="build-archive"> <title>Build the archive: Folder organization, physical layout as information</title>
 
         <para>
-            The first thing to do and to know before you put anything onto your system is a to build an information structure (as opposed to data structure). Your image files have to be somehow organized within the computer, you have to decide if others should have access to your photographs (sharing), if you put them on a dedicated drive, on a network drive &etc; Keep in mind that you have to migrate one day onto some bigger volume.
+            The first thing to do and to know before you put anything onto your system is to build an information structure (as opposed to data structure). Your image files have to be somehow organized within the computer, you have to decide if others should have access to your photographs (sharing), if you put them on a dedicated drive, on a network drive &etc; Keep in mind that you have to migrate one day onto some bigger volume.
         </para>
 
         <para>
@@ -86,7 +86,7 @@
         </para>
 
         <para>
-            The real works begins here as we will apply tags, captions and a rating to every photograph. Of course, all images requiring the same attribute can be treated as a selection in one action. Lets start with rating or ranking. It's best to start with ranking because for further work you can concentrate on the good shots.
+            The real work begins here as we will apply tags, captions and a rating to every photograph. Of course, all images requiring the same attribute can be treated as a selection in one action. Lets start with rating or ranking. It's best to start with ranking because for further work you can concentrate on the good shots.
         </para>
 
     </sect3>
@@ -94,7 +94,7 @@
     <sect3 id="ranking"> <title>Rating/Ranking</title>
 
         <para>
-            A ranking systematic is implemented in &digikam; by the 5 star rating tool. In fact there are 6 levels, zero through five stars (*) can be attributed (when saving them into IPTC metadata a translation of levels ensures compatibility with other programs). Rating is rapidly applied with &digikam; using keyboard shortcuts or the mouse on single photographs or whole selections. The rating can then be entered as a search criterion or directly from the status bar quick filters. However, before you start attributing stars everywhere take a moment to establish personal criteria for ranking. Best practice is to write down your personal match of stars to some qualitative expression, that will define what you actually mean when giving 5 stars. Generally there should be much less images rated with increasing star assignment. A ratio of 3-10 between each level has proven useful. That will get you quite far in distinguishing your rating pyramid. Say, you choose a ratio of 7 between levels. For every 5 star image you'll then have 7 4 stars, 49 3 stars and so on, resulting in almost 20000 pictures. Amazing? Yes, and 16807 of them you didn't have to rate at all! You even can define a different rating scheme depending on the kind of use, 2 stars for commercial use, may mean something else than 2 stars holiday photos. It is also a good practice to define a neutral rating, everything below is actually a negative rating. This will help you culling and thinning your collection very efficiently. Or you could define purposes to ratings, say 0 stars for 'can throw away', 1 star for images in quarantine (decide later), 2 stars for gallery export, 3 stars for printing, 4 stars for selling, 5 stars for 'have to work on', as you please. It must suit<emphasis> your </emphasis>needs. The following table illustrates a possible evolution for a professional photographer using a ranking ratio of roughly 7 over the next 12 years. It is evident that the good shots can be easily found, even within millions of photos.
+            A ranking systematic is implemented in &digikam; by the 5 star rating tool. In fact there are 6 levels, zero through five stars (*) can be attributed (when saving them into IPTC metadata a translation of levels ensures compatibility with other programs). Rating is rapidly applied with &digikam; using keyboard shortcuts or the mouse on single photographs or whole selections. The rating can then be entered as a search criterion or directly from the status bar quick filters. However, before you start attributing stars everywhere take a moment to establish personal criteria for ranking. Best practice is to write down your personal match of stars to some qualitative expression, that will define what you actually mean when giving 5 stars. Generally there should be much less images rated with increasing star assignment. A ratio of 3-10 between each level has proven useful. That will get you quite far in distinguishing your rating pyramid. Say, you choose a ratio of 7 between levels. For every 5 star image you'll then have 7 4 stars, 49 3 stars and so on, resulting in almost 20000 pictures. Amazing? Yes, and 16807 of them you didn't have to rate at all! You even can define a different rating scheme depending on the kind of use, 2 stars for commercial use, may mean something else than 2 stars holiday photos. It is also a good practice to define a neutral rating, everything below is actually a negative rating. This will help you culling and thinning your collection very efficiently. Or you could define purposes to ratings, say 0 stars for 'can throw away', 1 star for images in quarantine (decide later), 2 stars for gallery export, 3 stars for printing, 4 stars for selling, 5 stars for 'have to work on', as you please. It must suit <emphasis> your </emphasis>needs. The following table illustrates a possible evolution for a professional photographer using a ranking ratio of roughly 7 over the next 12 years. It is evident that the good shots can be easily found, even within millions of photos.
         </para>
 
         <para>
@@ -121,11 +121,11 @@
         </para>
 
         <para>
-            In the long run you will not remember the details of your pictures and their subject (essentially the metadata in you brain will break down). It is therefore paramount that you <command>choose general and generic categories</command>. You will aways remember that a particular shot was set at a river bank in a country or continent (-> river, continent), but you'll have forgotten which river it was. Instead of only tagging it with 'Okavango' you tag it with river/Africa or river/South Africa. The details you can either put into a tag as well or into the captions. A trick may help you: How would you search for that river with an Internet search engine? That's the way to go!
+            In the long run you will not remember the details of your pictures and their subject (essentially the metadata in your brain will break down). It is therefore paramount that you <command>choose general and generic categories</command>. You will aways remember that a particular shot was set at a river bank in a country or continent (-> river, continent), but you'll have forgotten which river it was. Instead of only tagging it with 'Okavango' you tag it with river/Africa or river/South Africa. The details you can either put into a tag as well or into the captions. A trick may help you: How would you search for that river with an Internet search engine? That's the way to go!
         </para>
 
         <para>
-            Another categorization might be task-oriented as in 'print jobs', 'web export', 'personal', 'galleryXYZ', 'clients', 'slideshow' &etc; Create groups as you need them but not more, you should be able to remember by heart the top level tags at least, otherwise the differentiation will become useless. Don't forget that you have all the other attributes to narrow down the search. The right sidebar tag filter combines with any view of left sidebar (albums, calendar, timeline, tag and search).
+            Another categorization might be task-oriented as in 'print jobs', 'web export', 'personal', 'galleryXYZ', 'clients', 'slideshow', &etc; Create groups as you need them but not more, you should be able to remember by heart the top level tags at least, otherwise the differentiation will become useless. Don't forget that you have all the other attributes to narrow down the search. The right sidebar tag filter combines with any view of left sidebar (albums, calendar, timeline, tag and search).
         </para>
 
         <para>
@@ -160,7 +160,7 @@
         </para>
 
         <para>
-            So you might have to most beautiful portrait, sunset or landscape and nobody seems to care. Why is that? Look at some good photographs yourself without reading the title, comment or background information. How many of you are interested in depth of field, exposure time, white balance &etc;? Some, of course. But anybody will be interested in the story the pictures tell, you want to remember a photograph, meaningless images bombard us too much anyways. You have to give the viewer something that explains it all.
+            So you might have the most beautiful portrait, sunset or landscape and nobody seems to care. Why is that? Look at some good photographs yourself without reading the title, comment or background information. How many of you are interested in depth of field, exposure time, white balance &etc;? Some, of course. But anybody will be interested in the story the pictures tell, you want to remember a photograph, meaningless images bombard us too much anyways. You have to give the viewer something that explains it all.
         </para>
 
         <para>
diff --git a/digikam/using-mainwindow-advancedsearchtool.png b/digikam/using-mainwindow-advancedsearchtool.png
new file mode 100644
index 0000000..850e40b
Binary files /dev/null and b/digikam/using-mainwindow-advancedsearchtool.png differ
diff --git a/digikam/using-mainwindow-advancedsearchtool2.png b/digikam/using-mainwindow-advancedsearchtool2.png
new file mode 100644
index 0000000..d2b8380
Binary files /dev/null and b/digikam/using-mainwindow-advancedsearchtool2.png differ
diff --git a/digikam/using-mainwindow-advsearch.png b/digikam/using-mainwindow-advsearch.png
index 9d4976c..b31b9a2 100644
Binary files a/digikam/using-mainwindow-advsearch.png and b/digikam/using-mainwindow-advsearch.png differ
diff --git a/digikam/using-mainwindow-albumproperties.png b/digikam/using-mainwindow-albumproperties.png
index 620f5b3..53bc115 100644
Binary files a/digikam/using-mainwindow-albumproperties.png and b/digikam/using-mainwindow-albumproperties.png differ
diff --git a/digikam/using-mainwindow-albumview.png b/digikam/using-mainwindow-albumview.png
index 95d1ab4..491f152 100644
Binary files a/digikam/using-mainwindow-albumview.png and b/digikam/using-mainwindow-albumview.png differ
diff --git a/digikam/using-mainwindow-assigntags.png b/digikam/using-mainwindow-assigntags.png
index 3e1d8be..340f148 100644
Binary files a/digikam/using-mainwindow-assigntags.png and b/digikam/using-mainwindow-assigntags.png differ
diff --git a/digikam/using-mainwindow-dateview.png b/digikam/using-mainwindow-dateview.png
index d967ac5..cd75ef6 100644
Binary files a/digikam/using-mainwindow-dateview.png and b/digikam/using-mainwindow-dateview.png differ
diff --git a/digikam/using-mainwindow-duplicates-albumsfilter.png b/digikam/using-mainwindow-duplicates-albumsfilter.png
index f42d24d..9b82232 100644
Binary files a/digikam/using-mainwindow-duplicates-albumsfilter.png and b/digikam/using-mainwindow-duplicates-albumsfilter.png differ
diff --git a/digikam/using-mainwindow-facedetection.png b/digikam/using-mainwindow-facedetection.png
new file mode 100644
index 0000000..66a4b1c
Binary files /dev/null and b/digikam/using-mainwindow-facedetection.png differ
diff --git a/digikam/using-mainwindow-facedetectiontag.png b/digikam/using-mainwindow-facedetectiontag.png
new file mode 100644
index 0000000..c5435d4
Binary files /dev/null and b/digikam/using-mainwindow-facedetectiontag.png differ
diff --git a/digikam/using-mainwindow-filters.png b/digikam/using-mainwindow-filters.png
index fc0e055..a2e8bb8 100644
Binary files a/digikam/using-mainwindow-filters.png and b/digikam/using-mainwindow-filters.png differ
diff --git a/digikam/using-mainwindow-icon-showfacetags.png b/digikam/using-mainwindow-icon-showfacetags.png
new file mode 100644
index 0000000..71a337b
Binary files /dev/null and b/digikam/using-mainwindow-icon-showfacetags.png differ
diff --git a/digikam/using-mainwindow-iconview.png b/digikam/using-mainwindow-iconview.png
index e393b39..7057e1d 100644
Binary files a/digikam/using-mainwindow-iconview.png and b/digikam/using-mainwindow-iconview.png differ
diff --git a/digikam/using-mainwindow-labelsview.png b/digikam/using-mainwindow-labelsview.png
new file mode 100644
index 0000000..854b49a
Binary files /dev/null and b/digikam/using-mainwindow-labelsview.png differ
diff --git a/digikam/using-mainwindow-mapsearch.png b/digikam/using-mainwindow-mapsearch.png
index bd2404c..5b4236d 100644
Binary files a/digikam/using-mainwindow-mapsearch.png and b/digikam/using-mainwindow-mapsearch.png differ
diff --git a/digikam/using-mainwindow-preview.png b/digikam/using-mainwindow-preview.png
index 3d90110..1ad4015 100644
Binary files a/digikam/using-mainwindow-preview.png and b/digikam/using-mainwindow-preview.png differ
diff --git a/digikam/using-mainwindow-searchsimilar.png b/digikam/using-mainwindow-searchsimilar.png
index d6acdde..4a0b0a2 100644
Binary files a/digikam/using-mainwindow-searchsimilar.png and b/digikam/using-mainwindow-searchsimilar.png differ
diff --git a/digikam/using-mainwindow-searchsketch.png b/digikam/using-mainwindow-searchsketch.png
new file mode 100644
index 0000000..2edba1b
Binary files /dev/null and b/digikam/using-mainwindow-searchsketch.png differ
diff --git a/digikam/using-mainwindow-searchview.png b/digikam/using-mainwindow-searchview.png
index ab9524c..369f7a6 100644
Binary files a/digikam/using-mainwindow-searchview.png and b/digikam/using-mainwindow-searchview.png differ
diff --git a/digikam/using-mainwindow-tagsview.png b/digikam/using-mainwindow-tagsview.png
index fa4dbe0..0a438b0 100644
Binary files a/digikam/using-mainwindow-tagsview.png and b/digikam/using-mainwindow-tagsview.png differ
diff --git a/digikam/using-mainwindow-timeline.png b/digikam/using-mainwindow-timeline.png
index 63cf4a1..bb0a55d 100644
Binary files a/digikam/using-mainwindow-timeline.png and b/digikam/using-mainwindow-timeline.png differ
diff --git a/digikam/using-mainwindow-toolbar.png b/digikam/using-mainwindow-toolbar.png
index d49ce1d..426b091 100644
Binary files a/digikam/using-mainwindow-toolbar.png and b/digikam/using-mainwindow-toolbar.png differ
diff --git a/digikam/using-mainwindow-tooltip.png b/digikam/using-mainwindow-tooltip.png
index 0aa8496..b5698f7 100644
Binary files a/digikam/using-mainwindow-tooltip.png and b/digikam/using-mainwindow-tooltip.png differ
diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook
index 7cb3d20..e6d23f2 100644
--- a/digikam/using-mainwindow.docbook
+++ b/digikam/using-mainwindow.docbook
@@ -13,11 +13,11 @@
         <title>Areas and Bars</title>
 
         <para>
-            &digikam;'s main window has two areas in the center showing your photographs. One is the <firstterm>Icon Area</firstterm>, showing thumbnails of the contents of the selected album or of a search result, and the other one the <firstterm>Preview</firstterm>, showing the selected image. Together let's call them the <link linkend="using-imagearea">Image Area</link>. In the top left corner of the Preview we have a few buttons for moving back and forth through the content of the album, for rotating the image, for showing or adding face tags and to switch to fullscreen mode. By clicking on the preview you can make it disappear and by clicking on the picture area of a thumbnail open it again.
+            &digikam;'s main window has two areas in the center showing your photographs. One is the <firstterm>Icon Area</firstterm>, showing thumbnails of the content of the selected album or of a search result, and the other one the <firstterm>Preview</firstterm>, showing the selected image. Together let's call them the <link linkend="using-imagearea">Image Area</link>. In the top left corner of the Preview we have a few buttons for moving back and forth through the content of the album, for rotating the image, for showing or adding face tags and to switch to full screen mode. By clicking on the preview you can make it disappear and by clicking on the picture area of a thumbnail open it again.
         </para>
 
         <para>
-            The Image Area in the center is surrounded by the menu bar and the <link linkend="maininterface-toolbar">Main Toolbar</link> at the top, the <link linkend="maininterface-statusbar">Status Bar</link> at the bottom and the Left and <link linkend="using-sidebar-intro">Right Sidebar</link>. The Left Sidebar lets you switch between eight <quote>Views</quote>: Albums (shown here), Tags, Labels, Dates, Timeline, Search, Fuzzy (Search) and People (Tags). The Right Sidebar can be used to show all information about your images and partly also to edit them. You can use all these views to organize and find your photographs. If you click on one of the buttons on the sidebars they will fold out another area, offering possibilities to select, to make inputs, ⪚ for searches, to edit data and to show information.
+            The Image Area in the center is surrounded by the menu bar and the <link linkend="maininterface-toolbar">Main Toolbar</link> at the top, the <link linkend="maininterface-statusbar">Status Bar</link> at the bottom and the Left and <link linkend="using-sidebar-intro">Right Sidebar</link>. The Left Sidebar lets you switch between eight <quote>Views</quote>: Albums (shown here), Tags, Labels, Dates, Timeline, Search, Fuzzy (Search) and People (Tags). The Right Sidebar can be used to show all informations about your images and partly also to edit them. You can use all these views to organize and find your photographs. If you click on one of the buttons on the sidebars there will fold out another area, offering possibilities to select, to make inputs, ⪚ for searches, to edit data and to show informations.
         </para>
 
         <para>
@@ -25,7 +25,7 @@
         </para>
 
         <para>
-            Drag and Drop of images works about everywhere: d&d an image into another branch of the album tree, across the horizontal album separation line, or to another application window. The only restriction is that you cannot d&d into tag, date or searches.
+            Drag & Drop of images works about everywhere: d&d an image into another branch of the album tree, across the horizontal album separation line, or to another application window. The only restriction is that you cannot d&d into tag, date or searches.
         </para>
 
         </sect3>
@@ -44,7 +44,7 @@
                 </listitem>
                 <listitem><para>a progress bar for batch processes, ⪚ assigning tags</para></listitem>
                 <listitem><para>a thumbnail and preview size slider with buttons for "Fit to Window" and "Zoom to 100%"</para></listitem>
-                <listitem><para>a size selection popup list in % for the preview</para></listitem>
+                <listitem><para>a size selection pop up list in % for the preview</para></listitem>
             </itemizedlist>
             </para>
 
@@ -141,11 +141,11 @@
             </para>
 
             <para>
-                As an alternative you can display the photographs in a table by hitting the <menuchoice><guimenu>Table</guimenu></menuchoice> button on the Main Toolbar or by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Table</guimenuitem></menuchoice> menu from the menu bar. This allows to see a lot of photographs at the same time (Tip: leave away the thumbnail column) in a way you can customize the usual way by right-clicking on the headline bar and choose the information you want to see. Left-clicking on a line in the table will open the preview of that photograph.
+                As an alternative you can display the photographs in a table by hitting the <menuchoice><guimenu>Table</guimenu></menuchoice> button on the Main Toolbar or by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Table</guimenuitem></menuchoice> menu from the menu bar. This allows to see a lot of photographs at the same time (Tip: leave away the thumbnail column) in a way you can customize the usual way by right-clicking on the headline bar and choose the informations you want to see. Left-clicking on a line in the table will open the preview of that photograph.
             </para>
 
             <para>
-                You can access all of the functions that &digikam; can perform on a photograph by right-clicking the thumbnail or line in the table (context menu) or by selecting from the <menuchoice><guimenu>Item</guimenu></menuchoice> menu in the menu bar.
+                You can access most of the functions that &digikam; can perform on a photograph by right-clicking the thumbnail or line in the table (context menu) or by selecting from the <menuchoice><guimenu>Item</guimenu></menuchoice> menu in the menu bar.
             </para>
 
         </sect3>
@@ -163,13 +163,13 @@
                 <inlinemediaobject>
                     <imageobject><imagedata fileref="&path;using-mainwindow-icon-fullscreen.png" format="PNG"/> </imageobject>
                 </inlinemediaobject> 
-                either on the thumbnail or on the preview. While viewing images you can take action from the context menu at any time (not in fullscreen mode). To close the preview, just click again or press
-                    &Esc;
+                either on the thumbnail or on the preview. While viewing images you can take action from the context menu at any time (not in fullscreen mode). To close the preview, just click again or press 
+                    &Esc; 
                 or
-                    <keycap>F3</keycap>
+                    <keycap>F3</keycap> 
                 or click the 
                 <menuchoice><guimenu>Table</guimenu></menuchoice> or 
-                <menuchoice><guimenu>Thumbnail</guimenu></menuchoice> button.
+                <menuchoice><guimenu>Thumbnails</guimenu></menuchoice> button.
             </para>
 
             <para>
@@ -284,8 +284,7 @@
         </para>
 
         <para>
-	  By clicking the <quote>Albums</quote> button on the left side bar you toggle the <quote>Albums</quote> tree which provides an organized view of your photograph albums. The top item <quote>Albums</quote> just shows the <quote>welcome to &digikam;</quote> screen in the view area. The next level of the <quote>Albums</quote> tree shows your different Collections (marked by the <inlinemediaobject><imageobject><imagedata fileref="&path;using-mainwindow-icon-collection.png" format="PNG" /> </imageobject>
-	      </inlinemediaobject> icon) or at least one if you haven't added one or more yet in the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> Collections section. Each Collection represents a folder branch on your hard disk, on removable media or on network shares and the next levels in the tree show the structure of those  folders, here called <quote>Albums</quote>. The albums can be sorted by their folder layout on the hard disk, by the Category that has been set in the <link linkend="albumpropsedit.anchor">Album Properties</link> or by the Date of that Albums (this date can also be changed in the Properties of each Album). You can invert the sort order (ascending/descending) by clicking on the title bar of the album tree.
+            By clicking the <quote>Albums</quote> button on the left side bar you toggle the <quote>Albums</quote> tree which provides an organized view of your photograph albums. The top item <quote>Albums</quote> just shows the <quote>welcome to &digikam;</quote> screen in the view area. The next level of the <quote>Albums</quote> tree shows your different Collections (marked by the <inlinemediaobject><imageobject><imagedata fileref="&path;using-mainwindow-icon-collection.png" format="PNG" /></imageobject></inlinemediaobject> icon) or at least one if you haven't added one or more yet in the <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> Collections section. Each Collection represents a folder branch on your hard disk, on removable media or on network shares and the next levels in the tree show the structure of those  folders, here called <quote>Albums</quote>. The albums can be sorted by their folder layout on the hard disk, by the Category that has been set in the <link linkend="albumpropsedit.anchor">Album Properties</link> or by the Date of that Albums (this date can also be changed in the Properties of each Album). You can invert the sort order (ascending/descending) by clicking on the title bar of the album tree.
         </para>
 
         <para>
@@ -296,7 +295,7 @@
         <title>Creating a New Album</title>
 
             <para>
-                There are a number of ways to create a new Album. You can create a new Album when you upload new photographs from the Camera using <menuchoice><guimenu>Import</guimenu> <guimenuitem>Cameras</guimenuitem></menuchoice>. You can also create a new empty Album with <menuchoice><guimenu>Album</guimenu> <guimenuitem>New...</guimenuitem></menuchoice> (&Ctrl;+<keycap>N</keycap>) in the <quote>Albums</quote> view. As an additional option, you can create a new Album by importing an existing folder of photographs from your computer; just select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Folders...</guimenuitem></menuchoice> from the menu bar and select the folder that you want to import. An Album will be created with the same name as the hard disk folder. You can use drag and drop to import a folder. Drag a folder icon, for example from a &konqueror; window. Then drop it on the album list on the left. A menu will appear that gives you the option to move or copy the folder into &digikam;.
+                There are a number of ways to create a new Album. You can create a new Album when you upload new photographs from the Camera using <menuchoice><guimenu>Import</guimenu> <guimenuitem>Cameras</guimenuitem></menuchoice>. You can also create a new empty Album with <menuchoice><guimenu>Album</guimenu> <guimenuitem>New...</guimenuitem></menuchoice> (Ctrl+N) in the <quote>Albums</quote> view. As an additional option, you can create a new Album by importing an existing folder of photographs from your computer; just select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Folders...</guimenuitem></menuchoice> from the menu bar and select the folder that you want to import. An Album will be created with the same name as the hard disk folder. You can use drag and drop to import a folder. Drag a folder icon, for example from a &konqueror; window. Then drop it on the album list on the left. A menu will appear that gives you the option to move or copy the folder into &digikam;.
             </para>
 
         </sect3>
@@ -314,7 +313,7 @@
         <title>Adding a Photograph to an Album</title>
 
             <para>
-                Most of the time you will create new Albums and populate them with photographs directly from your camera using the Camera Tool. However, sometimes you may want to add a photograph that you already have on your computer to an existing Album. To add a photograph to an Album select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Images...</guimenuitem></menuchoice> (&Ctrl;+&Alt;+<keycap>I</keycap>) from the menu bar. Select a source folder from the dialog and click <guibutton>OK</guibutton>. An import window will open. Select the photographs that you want to add and choose <guilabel>Download Selected</guilabel> from the <quote>Download</quote> drop down menu. A dialog will open where you can choose the destination album. The photographs will be copied into the Album. <guilabel>Download New</guilabel> (&Ctrl;+<keycap>N</keycap>) from the same menu will copy only those images which are not in the destination folder yet.
+                Most of the time you will create new Albums and populate them with photographs directly from your camera using the Camera Tool. However, sometimes you may want to add a photograph that you already have on your computer to an existing Album. To add a photograph to an Album select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Images...</guimenuitem></menuchoice> (Ctrl+Alt+I) from the menu bar. Select a source folder from the dialog and click OK. An import window will open. Select the photographs that you want to add and choose <guilabel>Download Selected</guilabel> from the <quote>Download</quote> drop down menu. A dialog will open where you can choose the destination album. The photographs will be copied into the Album. <guilabel>Download New</guilabel> (Ctrl+N) from the same menu will copy only those images which are not in the destination folder yet.
             </para>
 
             <para>
@@ -362,7 +361,7 @@
                 <listitem><para>The Album <guilabel>Category</guilabel> : this is a way of grouping your Albums together by a common label. The Category you set will be used to order your albums when you select <guilabel>By Category</guilabel> from the drop down box in the tool bar or using <menuchoice><guimenu>View</guimenu><guimenuitem>Sort Albums</guimenuitem><guimenuitem>By Category</guimenuitem></menuchoice>. If you want to add and delete Category labels, choose from the menu <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;</guimenuitem></menuchoice> and here the Album Category section.
                 </para></listitem>
 
-                <listitem><para>The <guilabel>Caption</guilabel> for the Album : Usually a short description of the content, but of course you are free to abuse in any conceivable way. But beware: this will be shown in the banner at the top of the main Image Window ;-)
+                <listitem><para>The <guilabel>Caption</guilabel> for the Album : Usually a short description of the content, but of course you are free to abuse it in any conceivable way. But beware: this will be shown in the banner at the top of the main Image Window ;-)
                 </para></listitem>
 
                 <listitem><para>The Album <guilabel>Date</guilabel> : this will be used when you order your Albums by date using <menuchoice><guimenu>View</guimenu><guimenuitem>Sort Albums</guimenuitem><guimenuitem>By Date</guimenuitem></menuchoice>.
@@ -383,7 +382,7 @@
             </para>
 
             <para>
-	      To select a photograph as the Album icon, right-click on the photograph that you want to use as the Album icon and select <guimenuitem>Set as Album Thumbnail</guimenuitem> from the context menu. Additionally you can use drag and drop to set the Album icon. Drag the photographs icon from the thumbnail area and drop it on the currently selected Album in the Album list.
+            To select a photograph as the Album icon, right-click on the photograph that you want to use as the Album icon and select <guimenuitem>Set as Album Thumbnail</guimenuitem> from the context menu. Additionally you can use drag and drop to set the Album icon. Drag the photographs icon from the thumbnail area and drop it on the currently selected Album in the Album list.
             </para>
 
         <note>
@@ -401,70 +400,96 @@
     </sect2>
 
 
-    <sect2 id="using-mydatesview">       <title>Calendar View</title>
-
-        <para><inlinemediaobject><imageobject><imagedata fileref="&path;using-mainwindow-dateview.png" format="PNG" /> </imageobject>
-            <textobject><phrase>Dates View from Main Window</phrase></textobject></inlinemediaobject>
-        </para>
+    <sect2 id="using-mytagsview"> <title>Tags View</title>
 
         <para>
-        The <quote>Dates</quote> view organizes your photographs based on their dates. &digikam; uses either the
-        EXIF date or, if no EXIF date is available, the last modification time of the file.
+            (Hierarchical) tagging provides a flexible and powerful way to organize and catalog your images. Tags (also called <quote>keywords</quote> in other applications) are labels that can be applied to individual images or whole groups. Once a tag has been set to an image the image can be found again by selecting the tag or doing a search.
         </para>
 
         <para>
-        When you select a month from the list, all images from that month are displayed in the Image View.
-        You can select days or weeks in the date sheet at the bottom of the Date View to show only the images
-        from the selected dates.
+            Tags can be arranged in a hierarchical tree. This allows you to organize your tags in a logical manner. You can collapse parts of the tree in the <quote>Tags</quote> list so that you can easily find the tags that you are looking for.
         </para>
-
-    </sect2>
-
-    <sect2 id="using-mytagsview"> <title>Tags View</title>
-
+        
+        <para></para>
+        
         <para>
-            (Hierarchical) tagging provides a flexible and powerful way to organize and catalog your images. Tags are labels that can be applied to individual images or whole groups. Once a tag has been set to an image it can be found again by selecting the tag or doing a search.
+            <inlinemediaobject>
+                <imageobject><imagedata fileref="&path;using-mainwindow-tagsview.png" format="PNG" /></imageobject>
+            </inlinemediaobject>
         </para>
 
-        <example> <title>Selecting a tag and applying a new one</title>
-            <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-tagsview.png" format="PNG" /> </imageobject></mediaobject></screenshot>
-        </example>
-
         <para>
-            When a tag is selected, all of the images that are marked with that tag are displayed.
+            When a tag is selected in the Left Sidebar, all of the images that are marked with that tag are displayed in the View Area.
         </para>
-
+        
         <para>
-            Tags can be arranged in a hierarchical tree. This allows you to organize your tags in a logical manner. One can collapse parts of the tree in the <quote>Tags</quote> list so that one can easily find the tags that you are looking for.
+            But before assigning and using tags you first have to define them. If you import photographs with tags assigned &digikam; will build an appropriate tag tree during import. Other than that you have to define tags by yourself. An easy access to that is the context menu shown in the screenshot above.
         </para>
 
-        <tip>
-            <para>
-                Tags are stored in a database for fast access, and, the applied tags are written into IPTC data fields of the image (at least for JPEG). So can use your tags with other programs or, in case of loss of that data in the database, the tags will be re-imported when the image is noticed by &digikam;.
-            </para>
-        </tip>
+
 
         <sect3 id="using-managetags"> <title>Managing Tags</title>
 
             <para>
-                You can add new tags by right-clicking on either the <quote>Tags</quote> label or an existing tag and selecting <guilabel>New Tag</guilabel>. If you add a new tag by right-clicking on an existing tag, your new tag will be created as a sub-tag.
+                You can add new tags by right-clicking on either the <quote>Tags</quote> label or an existing tag and selecting <guilabel>New Tag...</guilabel>. A dialog will open where you can type in the tag name (or even a whole hierarchy branch), assign an icon and/or a shortcut to the tag. If you add a new tag by right-clicking on an existing tag, your new tag will be created as a sub-tag.
             </para>
 
             <para>
-                You can delete a Tag by right-clicking on the Tag you want to delete and selecting <guilabel>Delete</guilabel> Tag. When you delete a tag, the photographs themselves are not deleted. Simply the tag is removed from those photographs.
+                You can delete a tag by right-clicking on the tag you want to delete and selecting <guilabel>Delete Tag</guilabel>. When you delete a tag, the photographs themselves are not deleted. Simply the tag is removed from those photographs.
             </para>
 
             <para>
-                You can move the position of a Tag within the tree by dragging it to the position that you want and dropping it there. A menu will appear that gives you the option to
+                You can move the position of a tag within the tree by dragging it to the position that you want and dropping it there. A menu will appear that gives you the option to
                 <guilabel>Move</guilabel> the tag. This works from the left and right sidebar. A tag can only be in one place in the tree at a time.
             </para>
 
             <para>
-                You can set the Tag Properties by right-clicking on a Tag and selecting <guilabel>Edit Tag Properties</guilabel>. The Tag Properties allow you to change the name of the tag and the icon used in the <quote>Tags</quote> tree.
+                You can set the Tag Properties by right-clicking on a tag and selecting <guilabel>Properties...</guilabel>. The Tag Properties allow you to change the name of the tag, the icon used in the Tags tree and the shortcut.
             </para>
 
             <para>
-                To select a different photograph as the tag icon, right-click on the photograph that you want to use as the tag icon and select "Set as Tag Thumbnail" from the context menu. Additionally you can use drag and drop to set the tag icon. Drag the images icon and drop it on the currently selected tag in the tag list.
+                To select a photograph as the tag icon, right-click on the photograph that you want to use as the tag icon and select <guilabel>Set as Tag Thumbnail</guilabel> from the context menu. Additionally you can use drag and drop to set the tag icon. Drag the images icon and drop it on the currently selected tag in the tag list.
+            </para>
+            
+            <para>
+                A tool for more elaborate work on big tag trees is the <link linkend="using-tagsmngr">Tags Manager</link> which you can access by clicking the <guilabel>Open Tag Manager</guilabel> button at the top of the Tags tree.
+            </para>
+            
+            <para>
+                In the <link linkend="keywords">Digital Asset Management (DAM)</link> chapter of this handbook you can find some useful considerations about how to build your Tags tree.
+            </para>
+            
+            <para> 
+                It is not always easy to build a logical hierarchy from general and generic categories. You might run into a problem like this:
+            </para>
+            
+            <blockquote><screen>
+                Animal
+                    - Domestic Animal
+                        - Cat
+                        - Cattle
+                        - Dog
+                        
+                    - Wild Animal
+                        - Bird
+                        - Cat
+                            - Cheetah
+                            - Lion
+                            - Tiger
+                            
+                    - Zoo Animal
+                        - Bird
+                        - Cat
+                            - Cheetah
+                            - Leopard
+            </screen></blockquote>
+    
+            <para>
+                In this tag tree the keyword <quote>Cat</quote> appears three times. This will not cause a problem within &digikam; but there are quite a few views where the user cannot know which of the three is applied to an image because he might not be able to see the whole hierarchy of the tag. A help could be to tag the image in a case like this also with the parent tag or even the whole hierarchy but it becomes quite unwieldy, ⪚ in the image icon if you have the tags displayed there. The second <quote>Cat</quote> can be avoided by calling it <quote>Wild Cat</quote> but calling the third one <quote>Zoo Cat</quote> is a bit out of the roof, I think. And still: there are also two <quote>Cheetah</quote>!
+            </para>
+            
+            <para>
+                Solution: You replace the <quote>Zoo Animal</quote> branch by a single tag <quote>Zoo</quote> which you use in addition to the tag you choose from the two remaining branches. You could even put it on the top level of your hierarchy if you have photographs taken in a zoo but not showing animals.
             </para>
 
         </sect3>
@@ -472,175 +497,322 @@
         <sect3 id="using-taggingimages"> <title>Tagging Photographs</title>
 
             <para>
-                Before you can get the most out of &digikam;'s Tagging capabilities, you must first tag your photographs. There are two methods of tagging photographs. Once you have identified the photographs that you want to tag you can either drag and drop them onto the Tag in the "My Tags" tree or, by right-clicking on the selected photographs in the Image Window, you can use the <guilabel>Assign Tag</guilabel> menu to select the Tags you wish to set.
+                Before you can get the most out of &digikam;'s tagging capabilities, you must first tag your photographs. There are a few methods for that task. Once you have identified the photographs that you want to tag you can either drag and drop them onto the tag in the Tags tree or, by right-clicking on the selected photographs in the Image Window, you can use the <guilabel>Assign Tag</guilabel> menu to select the tags you wish to set.
             </para>
-
+            
             <para>
-                You can label a photograph with as many tags as you like. The photograph will appear when you select any of the tags that are set against it. This way you can set a tag for each person in a photograph, as well as the place the photograph was taken, the event it was taken at, &etc;
+                Drag and Drop: works with both sidebars provided they are showing tags of course. With the Right Sidebar it works the obvious way: you drag the tag and drop it onto the photograph or selection of photographs you want to tag. With the Left Sidebar you have to drag the photographs to the tags. You want to know why? Just try it the other way and you will see :-)
             </para>
-
-            <example> <title>Tagging Image with context menu, or with drag&drop  from either sidebar</title>
-                <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-assigntags.png" format="PNG" /> </imageobject></mediaobject></screenshot>
+            
+            <para>
+                Shortcuts: as mentioned earlier in this chapter you can assign keyboard shortcuts in the Tag Properties. With these you can assign or un-assign a tag to the selected photograph(s).
+            </para>
+            
+            <para>
+                Context menu: by right-clicking on the selected photographs and choosing <guilabel>Assign Tag</guilabel> you will see the next menu step offering the ten most recently used tags, <guilabel>Add New Tag...</guilabel>, described at the beginning of the previous <link linkend="using-managetags">article</link>, and <guilabel>More Tags...</guilabel> which leads to what is described in the next paragraph. The context menu method is obviously very useful if you use only a limited number of tags out of your whole tree for a while.
+            </para>
+            
+            <example>
+                <title>Tagging Image with context menu</title>
+                <mediaobject>
+                    <imageobject><imagedata fileref="&path;using-mainwindow-assigntags.png" format="PNG" /></imageobject>
+                </mediaobject>
             </example>
 
             <para>
-                Once you have tagged a photograph, the tag name will appear under the thumbnail in the Image Window.
+                You can remove a tag from a photograph by right-clicking on the photograph and using the <guilabel>Remove Tag</guilabel> menu. This menu will only show those tags that have been set on this photograph.
             </para>
 
             <para>
-                You can remove a tag from a photograph by right-clicking on the photograph and using the <guilabel>Remove</guilabel> Tag menu. This menu will only show those tags that have been set on this photograph.
+                The Right Sidebar: this is what I would call my standard method for assigning tags. Click <guilabel>Captions/Tags</guilabel> on the Right Sidebar and then the <guilabel>Tags</guilabel> tab and you will see the whole tags tree. Simply check/un-check the boxes of the tags you want to assign/un-assign and then click <guilabel>Apply</guilabel>. If you change focus without that you will be asked whether you want to apply the changes unless you disabled that confirmation either by checking <quote>Always apply changes without confirmation</quote> or by checking <quote>Do not confirm when applying changes in the right sidebar</quote> in the Miscellaneous section of <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure digiKam...</guimenuitem></menuchoice>. More details about the other buttons and fields in the <guilabel>Tags</guilabel> tab see in <link linkend="using-sidebar-tags">&digikam; sidebar</link>.
+            </para>
+            
+            <para>
+                You can label a photograph with as many tags as you like. The photograph will appear when you select any of the tags that are set against it. This way you can set a tag for each person in a photograph, as well as the place the photograph was taken, the event it was taken at, &etc;
             </para>
 
+            <para>
+                Once you have tagged a photograph, the tag name will appear under the thumbnail in the Image Area.
+            </para>
+
+            <tip>
+                <para>
+                    Tags are stored in a database for fast access, and, the applied tags are written into IPTC data fields of the image (at least for JPEG). So you can use your tags with other programs or, in case of loss of that data in the database, the tags will be re-imported when the image is noticed by &digikam;.
+                </para>
+            </tip>
+
         </sect3>
 
     </sect2>
 
-    <sect2> <title>Timeline View</title>
+    <sect2 id="using-mylabelsview"> <title>Labels View</title>
 
         <para>
-            The timeline view shows a timescale-adjustable histogram of the numbers of images per time unit. A selection frame moves over the histogram. To select a time frame just click into the <emphasis>lower square</emphasis> of the selection frame where the time unit is indicated. That will show all corresponding images in the main window.
+            The Labels View allows you to select photographs by the Rating, Pick and Color labels you assigned to them previously either by using the context menu of a thumbnail or the <guilabel>Description</guilabel> tab of the <guilabel>Captions/Tags</guilabel> section on the Right Sidebar.
         </para>
 
         <para>
-            In the field right below you can enter a title and save your selection. It will then appear in the list field at the bottom.
+            <inlinemediaobject>
+                <imageobject><imagedata fileref="&path;using-mainwindow-labelsview.png" format="PNG" /></imageobject>
+            </inlinemediaobject>
         </para>
 
-        <example>
+        <para>
+            You may select more than one label by <keycombo action="simul">&Ctrl;<mousebutton>left</mousebutton></keycombo> click. The selected labels are connected by boolean AND, ⪚ selecting Four Star and Yellow will display only photographs that have <emphasis>both</emphasis> labels assigned. You can perform even more sophisticated searches by using the <guilabel>Filters</guilabel> section of <link linkend="using-sidebar-filters">The Right Sidebar</link>.
+        </para>
 
-            <title>The Timeline View in Action</title>
-            <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-timeline.png" format="PNG" /> </imageobject></mediaobject></screenshot>
+        
+    </sect2>
 
-        </example>
+    <sect2 id="using-mydatesview"><title>Dates View</title>
+
+        <para>
+            <inlinemediaobject>
+                <imageobject><imagedata fileref="&path;using-mainwindow-dateview.png" format="PNG" /></imageobject>
+                <textobject><phrase>Dates View from Main Window</phrase></textobject>
+            </inlinemediaobject>
+        </para>
+
+        <para>
+            The <quote>Dates</quote> view organizes your photographs based on their dates. &digikam; uses either the
+            EXIF date or, if no EXIF date is available, the last modification time of the file.
+        </para>
+
+        <para>
+            When you select a month from the list, all images from that month are displayed in the Image Area.
+            You can select days or weeks in the date sheet at the bottom of the Left Sidebar to show only the images from the selected dates.
+        </para>
+
+    </sect2>
+
+    <sect2 id="using-mytimelineview"> <title>Timeline View</title>
+
+        <para>
+            The Timeline View shows a timescale-adjustable histogram of the numbers of images per time unit which is selectable by a drop down field. To the right of that you can choose between a linear or logarithmic histogram. A selection frame moves over the histogram. To display the photographs out of a certain time frame just click on the corresponding bar. You are not restricted to one bar. With <keycombo action="simul">&Shift;<mousebutton>left</mousebutton></keycombo> click or <keycombo action="simul">&Ctrl;<mousebutton>left</mousebutton></keycombo> click you can add more bars to the first one.
+        </para>
+
+        <para>
+            <inlinemediaobject>
+                <imageobject><imagedata fileref="&path;using-mainwindow-timeline.png" format="PNG" /></imageobject>
+            </inlinemediaobject>
+        </para>
+
+        <para>
+            In the field right below you can enter a title and save your selection. It will then appear in the <quote>Searches</quote> list field below. But the best is still to come: the Timeline View offers a search for a search! If you have a lot more searches saved than my ridiculous four in the screenshot the adaptive search field at the bottom may help to find a certain search.
+        </para>
 
     </sect2>
 
-    <sect2 id="using-mysearchesview"> <title>Searches View</title>
+    <sect2 id="using-mysearchesview"> <title>Search View</title>
+        <para>
+            We talked about quite a few views already and their searching capabilities, which are all kind of specialized. The Search View now offers a more versatile and general way of searching. There are two different approaches.
+        </para>
+        
+        <para>
+            <inlinemediaobject>
+                <imageobject><imagedata fileref="&path;using-mainwindow-searchview.png" format="PNG" /> </imageobject>
+            </inlinemediaobject>
+        </para>
 
         <sect3> <title>The Quick Search</title>
         <anchor id="quicksearchtool.anchor"/>
 
             <para>
-                Quick Search is a little box in the status bar and provides you with a simple means to search all data fields in the album library with a single query. You can enter any arguments in the <guilabel>Search</guilabel> text field and it will be used to determine the results. For instance, you can enter the string 'birthday' to search the complete album library for occurrences of the word 'birthday' in all photograph descriptions, or '05.png' to search for a specific image file name '05.png' (no escaping as in regexpressions needed).
+                Quick Search is the adaptive search box at the top of the search dialog (Left Sidebar) and provides you with a simple means to search the &digikam; database with a single query. You can enter any arguments in the <guilabel>Search:</guilabel> text field and it will be used to determine the results. For instance, you can enter the string 'birthday' to search the complete album library for occurrences of the word 'birthday' in all photograph descriptions, or '05.png' to search for a specific image file name '05.png' (no escaping as in regexpressions needed).
             </para>
 
-            <para>Search Properties:<itemizedlist>
-                <listitem><para>searches are case insensitive</para></listitem>
-                <listitem><para>blank separated search terms are boolean AND combinations</para></listitem>
-                <listitem><para>special characters are literal and not interpreted ( . * ? / &etc;)</para></listitem>
-                <listitem><para>include all elements of the database: names, rating, keywords, tags, albums, collections, dates (and more in the future)</para></listitem>
+            <para>Search Properties:
+                <itemizedlist>
+                    <listitem><para>searches are case insensitive</para></listitem>
+                    <listitem><para>blank separated search terms are boolean AND combinations</para></listitem>
+                    <listitem><para>special characters are literal and not interpreted ( . * ? / &etc;)</para></listitem>
+                    <listitem><para>include all elements of the database: names, rating, keywords, tags, albums, collections, dates (and more in the future)</para></listitem>
                 </itemizedlist>
             </para>
 
             <para>
-                The Quick Search really works intuitively. If you want to search images from a certain date, you can simply type <userinput>2005</userinput>, but it is even possible to search for a certain month. Just enter the name of the month in your local language. If it is Dutch, you can enter <userinput>Maart</userinput>, to see the images of March. The combination of 'Maart 2006' means 'Maart AND 2006' and therefore is equivalent to '2006 Maart'. Or look for 'Maart 2007 cr2' to find all RAW files of March 2007.
+                You can save your searches as a live folder that always filters for what you entered as search criteria. Just type a name for the search into the <guilabel>Save Current Search</guilabel> field and click the save button to the right of it. When saved, the filter will appear in the <guilabel>Searches</guilabel> list. By clicking the title bar of this list you can invert the sorting order. Once you select one of your saved searches, the search result will be presented in the Image Area immediately and the <guilabel>Save Current Search</guilabel> field will convert into a <guilabel>Edit Stored Search</guilabel> field where you can edit your search criteria. The name of the saved search will be used to label the search result in the Image Area.
             </para>
 
             <para>
-                Next to the search box is a little LED that turns green if the search has results. Just click on it to reset the filtering and show all images again. If the search is not succeessful, the LED turns red.
+                If you want to delete or rename a saved search from the list, right-click on it and select from the context menu.
             </para>
 
-            <example>
-                <title>Quick Search Tool Dialog in Action</title>
-                <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-filters.png" format="PNG" /> </imageobject></mediaobject></screenshot>
-            </example>
-
         </sect3>
 
-        <sect3> <title>Searches proper</title>
+        <sect3 id="using-mainwindow-advancedsearchtool">
+        <title>The Advanced Search Tool</title>
 
             <para>
-                The more sophisticated search tool is a tab on the left sidebar (binocular icon). If you  open it, you will be presented with a simple search box the works as described above, except that you can save this search as a live folder that always filters for what you entered as search criteria. When saved, the filter will appear in the list.
+                Advanced Search tool provides an extended search form which can be used to search in specific fields of the &digikam; database in a more sophisticated way. Click the <guilabel>Advanced Search...</guilabel> button and it will come up like this:
             </para>
-
+                    
             <para>
-                When you are satisfied with your selection, click on the <guilabel>Ok</guilabel> button, and the search will be carried out, and the results displayed in "My Search" view from the main window. The <guilabel>Save search as</guilabel> text field will be used to label your query in "My Search" list. If you want to modify your selection after performing a search, simply right click on the item from "My Search" view and select an option from the pop-up menu.
+                <inlinemediaobject>
+                    <imageobject><imagedata fileref="&path;using-mainwindow-advancedsearchtool.png" format="PNG" /> </imageobject>
+                </inlinemediaobject>
             </para>
 
-            <example>
-                <title>Quick Search Tool Dialog in Action</title>
-                <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-searchview.png" format="PNG" /> </imageobject></mediaobject></screenshot>
-            </example>
-
             <para>
-                If you select <guilabel>Edit Search</guilabel>, the search form will re-appear, containing your previous search information. If you select <guilabel>Edit as Advanced Search</guilabel>, the advanced search tool dialog will be come up to modify your previous search information using more elaborate search rules. See the <link linkend="using-mainwindow-advancedsearchtool">The Advanced Search Tool</link> section for more information.
+                The field labeled <quote>Find pictures that have associated all these words:</quote> is just a duplicate of the Quick Search field.
             </para>
-
+            
             <para>
-                If you want to remove an existing search from the list, just select <guilabel>Delete Search</guilabel> from the pop-up menu.
+                Click on one of the blue categories and there will fold out an area with all the fields you can search for in that very category. Depending on the kind of data each field contains different input fields for your search, sometimes more than one type for the same field. Simplest are selection buttons, ⪚ for colors. Then you have plain fields of the <quote>The <replaceable>field content</replaceable> contains</quote> type, drop down lists and checkboxes. Many fields have two input fields allowing you to define a range, ⪚ <quote>Find pictures with a width between</quote>. And often you find a link type thing called <quote>Any</quote> which opens a drop down field with checkboxes for the possible contents of that field.
             </para>
 
             <example>
-                <title>Search View from Main Window</title>
-                <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-searchview.png" format="PNG" /> </imageobject></mediaobject></screenshot>
+                <title>Advanced Search Criteria</title>
+                <mediaobject>
+                    <imageobject><imagedata fileref="&path;using-mainwindow-advancedsearchtool2.png" format="PNG" /></imageobject>
+                </mediaobject>
             </example>
-
-        </sect3>
-
-        <sect3 id="using-mainwindow-advancedsearchtool">
-        <title>The Advanced Search Tool</title>
-        <anchor id="advancedsearchtool.anchor"/>
-
+            
             <para>
-                Advanced Search tool provides an extended search form with a wealth of search parameters, which can be used to search in specific fields of the &digikam; albums database.
+                Thanks to the labeling the search fields they are pretty much self explaining. What we have to talk about is how they work together if you fill in or select more than one. On the right side of the header (blue area at the top) you find a little link <quote>Options</quote>. If you click on that one the header will change and you see four options.
             </para>
-
+            
             <para>
-	      The <guilabel>Search Rules</guilabel> list is used to set all options to process a search query in the albums database. All rules are listed vertically and separated by an operator. An option can be added or deleted to the list using <guilabel>Add Search Group/Remove Group</guilabel>. Each option can be combined with another one using <guilabel>Meet all..</guilabel> or <guilabel>Meet any...</guilabel> or <guilabel>one of these...</guilabel>  <guilabel>At least one...</guilabel> logical operators. Thus, one can construct searches of the type <quote>AND NOT</quote>.
+                <itemizedlist>
+                    <listitem><para><quote>Meet All of the following conditions</quote> means that your different search parameters will be connected by boolean AND for the search. Example: if you selected Album name <quote>Holidays</quote> and color <quote>red</quote> the search will find all pictures labeled with <quote>red</quote> out of the Album <quote>Holidays</quote>.</para></listitem>
+                    <listitem><para><quote>Meet Any of the following conditions</quote> means that your different search parameters will be connected by boolean OR for the search. Example: if you selected Album name <quote>Holidays</quote> and color <quote>red</quote> the search will find all pictures labeled with <quote>red</quote> out of your whole collection <emphasis>and</emphasis> the content of the Album <quote>Holidays</quote>.</para></listitem>
+                    <listitem><para><quote>None of these conditions are met</quote> means that your different search parameters will be connected by boolean NAND for the search. Again our example: if you selected Album name <quote>Holidays</quote> and color <quote>red</quote> the search will find all pictures of your collection except those labeled with <quote>red</quote> <emphasis>and</emphasis> except those out of the Album <quote>Holidays</quote>.</para></listitem>
+                    <listitem><para><quote>At least one of these conditions is not met</quote> means that your different search parameters will be connected by boolean NOR for the search. One more example: if you selected Album name <quote>Holidays</quote> and color <quote>red</quote> the search will find all pictures of your collection except those labeled with <quote>red</quote> out of the Album <quote>Holidays</quote>.</para></listitem>
+                </itemizedlist>
+            </para>
+            
+            <para>
+                Complicated? No, good! Because the real stuff is yet to come. Have a look at the footer of the Advanced Search Tool. Here you find <guilabel>+ Add Search Group</guilabel>. If you hit this button another list with the same categories of search fields will open below the first one (scroll down in case you don't see it right away) separated by a blue header showing the same options we were just talking about. On top of them you see an underlined OR meaning that this list is connected to the first one by boolean OR. You can change that to AND by clicking on it.
+            </para>
+            
+            <para>
+                To explain how it works let's make another example based on one of those we had already. I want to use the second one. That means: in the first group you checked <quote>Meet Any of the following conditions</quote> and you selected Album name <quote>Holidays</quote> and color <quote>red</quote>. As we said already this will produce all pictures labeled with <quote>red</quote> out of your whole collection <emphasis>and</emphasis> the content of the Album <quote>Holidays</quote>. Now let's assume for some reason you want to exclude all rejected files and all files with a rating lower than three stars. So you open a second group, click on the underlined OR in the header in order to change it to AND, select <quote>None of these conditions are met</quote>, fold out the <quote>Picture Properties</quote>, select under <quote>Rating</quote> no star (five white stars) in the first field and two stars in the second field. Note that there is a difference between <quote>no star</quote> and <quote>No Rating assigned</quote>! If you want to exclude the pictures without any rating as well you got to open another Search Group, click on the underlined OR in the header in order to change it to AND, select <quote>None of these conditions are met</quote> and select <quote>No Rating assigned</quote> in the <quote>Picture Properties</quote> category.
+            </para>
+            
+            <para>
+                Which brings us to the fact that you can open as many additional Search Groups as you need to formulate your query. But since the purpose of this handbook is not to open a competition in creating the most sophisticated queries I leave it to you to figure out how far you have to go or can go in this respect and rather finish this section with a few hints about the other buttons in the Advanced Search Tool. Beside the <guilabel>+ Add Search Group</guilabel> button you see <guilabel>Reset</guilabel>. This removes all additional Search Groups and clears all the fields in the remaining one. It's a good policy to use this button before starting to create a new search, in particular when you leave the Advanced Search Tool with the intention to use the Quick Search for your next query, because otherwise the search criteria remain active even if you don't see them and screw up your new search. <guilabel>Try</guilabel> carries out the search but leaves the Advanced Search Tool window open, <guilabel>OK</guilabel> does the same but closes the window. <quote>Remove Group</quote> in the header of the additional Search Groups doesn't need an explanation, I think.
             </para>
 
             </sect3>
 
     </sect2>
 
-    <sect2 id="fuzzy-searches"> <title>Fuzzy and Duplicates Searches</title>
+    <sect2 id="fuzzy-searches"> <title>Fuzzy View</title>
 
             <para>
-                &digikam; characterizes every image by a legthy number using a special technique (Haar algorithm) that make it possible to compare images by comparing this calculated signature. The less numerical difference there is between any two image signatures, the more they resemble each other. This technique has three implementations
+                &digikam; characterizes every image by a lengthy number using a special technique (Haar algorithm) that makes it possible to compare images by comparing this calculated signature. The less numerical difference there is between any two image signatures, the more they resemble each other. This technique has three implementations in &digikam;:
             </para>
 
             <itemizedlist>
-                <listitem><para>Similar items: This is a drag&drop zone where you can drop any image to find a similar one. A threshold can be modified in order to narrow down or enlarge the resulting selection. Drag an image from anywhere over the fuzzy search icon in the left sidebar, it will open and you drop it there.</para></listitem>
-                <listitem><para>Sketch: free hand color sketching: draw a quick sketch and &digikam; will find corresponding images. Again a threshold can be set.</para></listitem>
-                <listitem><para>Duplicates: after &digikam; has scanned all collections you will find a list of duplicates here. It's up to you of course to decide what to do with them. From the menu <menuchoice><guimenu>Tools</guimenu><guimenuitem>Rebuild all fingerprints...</guimenuitem></menuchoice> you can initiate a total rebuild of the image signatures (may take hours if you have a large collection, an estimate is 2 hours for 10'000 images) or from the bottom you can just rescan, which is much faster. <guimenu>Find duplicates</guimenu> will do just that, but it will take a long time too as it has to compare every image with any other image. Fortunately, you can refine your search by albums and/or tags.</para></listitem>
+               
+                <listitem>
+                    <para>
+                        Duplicates: before you can have &digikam; finding duplicates the signatures (or fingerprints) have to be calculated. You can start that process with the button <guilabel>Update fingerprints</guilabel> which initiates a total rebuild of the image signatures (may take hours if you have a large collection, an estimate is 2 hours for 10'000 images). Once the fingerprints are calculated you can use <guilabel>Find duplicates</guilabel>, but it will take a long time too as it has to compare every image with any other image. So the way to go in both cases is to confine your search to certain albums and/or tags. With the Similarity threshold you can narrow down or enlarge the search result.
+                    </para>
+
+                    <example>
+                        <title>Find duplicates while restricting to an album</title>
+                        <mediaobject>
+                            <imageobject><imagedata fileref="&path;using-mainwindow-duplicates-albumsfilter.png" format="PNG" /></imageobject>
+                        </mediaobject>
+                    </example>
+                </listitem>
+                
+                <listitem>
+                    <para>
+                        Image (Similar items): This is a drag&drop zone where you can drop any image to find a similar one. Drag an image from anywhere over the fuzzy search icon in the left sidebar, it will open and you drop it there or use <guilabel>Find Similar...</guilabel> from the context menu of a thumbnail in any other view. You can narrow down or enlarge the resulting selection with a threshold here as well. In the field below you can enter a name for the search and save it. In the searches list below you find your saved searches. Clicking on the title bar of that list toggles the sorting order between ascending and descending. At the bottom you find an adaptive search field which can help you to find a particular search.
+                    </para>
+ 
+                    <example>
+                        <title>Fuzzy search for similar image</title>
+                        <mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-searchsimilar.png" format="PNG" /></imageobject></mediaobject>
+                    </example>
+               </listitem>
+
+                <listitem>
+                    <para>
+                        Sketch: free hand color sketching: draw a quick sketch and &digikam; will find corresponding images. You will find the same means to save your search as in the <guilabel>Image</guilabel> tab.
+                    </para>
+
+                    <example>
+                        <title>Fuzzy search by sketch</title>
+                        <mediaobject>
+                            <imageobject><imagedata fileref="&path;using-mainwindow-searchsketch.png" format="PNG" /></imageobject>
+                        </mediaobject>
+                    </example>
+                </listitem>
+ 
             </itemizedlist>
-
-            <example>
-                <title>Fuzzy search for similar image</title>
-                <screenshot><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-searchsimilar.png" format="PNG" /></imageobject></mediaobject></screenshot>
-            </example>
-
-            <example>
-                <title>Find duplicates while restricting to an album</title>
-                <screenshot><mediaobject>
-                <imageobject><imagedata fileref="&path;using-mainwindow-duplicates-albumsfilter.png" format="PNG" /></imageobject>
-                </mediaobject></screenshot>
-            </example>
     </sect2>
 
-    <sect2> <title>Map Searches</title>
 
+    <sect2> <title>People View</title>
+        
         <para>
-            This tab provides an intuitive map search tool based on the marble widget. You can zoom in and out with the mousewheel by either scrolling it or hold and drag it. Pan by holding down the left mouse button. Press the <keycombo action="press">&Ctrl;<keycap>left mouse button</keycap></keycombo> to pull-up a square as indicated. All images falling within the coordinates of that square will be filtered and shown (provided your images have been geo-coded of course).
+            As long as you are not just taking pictures from machines or stars or something like that, Face Management might be an interesting feature for you (even with a machine there might be a human being operating it). In &digikam; it consists of two tasks: Face Detection and Face Regognition.
         </para>
 
-        <para>
-            In the box below you can enter a name for your geo filter. It will be added to the list view below for future reference, it acts as a live geo folder.
-        </para>
-
-            <example>   <title>The Map Searches tab</title>
-
-                <screenshot><screeninfo>For higher resolution maps choose "More Info"</screeninfo><mediaobject><imageobject><imagedata fileref="&path;using-mainwindow-mapsearch.png" format="PNG" /> </imageobject></mediaobject></screenshot>
-
-            </example>
-
-    </sect2>
-
-    <sect2> <title>Face Management</title>
-
         <sect3> <title>Face Detection</title>
 
             <para>
-                TODO
+                The first step is to have &digikam; finding all those pics that show faces not even knowing yet who's face it is. To prepare that process you click <guilabel>Scan collection for faces</guilabel> which will open the Scanning faces dialog. Right under the header you have a drop down menu where you can choose between
+                <itemizedlist>
+                    <listitem>
+                        <para>Skip images already scanned</para>
+                    </listitem>
+                    <listitem>
+                        <para>Scan again and merge results</para>
+                    </listitem>
+                    <listitem>
+                        <para>Clear unconfirmed results and rescan</para>
+                    </listitem>
+                </itemizedlist>
+            </para>
+            
+            <para>
+                The first one you would choose if you didn't scan yet or if you did with a satisfying result but added new photographs since then. The second you would choose if you already improved a search result, ⪚ by removing face tags which obviously don't show a face. The third is more interesting in the context of Face Regognition since <quote>unconfirmed results</quote> means face tags that don't have a name assigned to them yet.
+            </para>
+            
+            <para>
+                For the task we are talking about you check <guilabel>Detect faces</guilabel>, of course. Since face detection is a time-consuming task you better <emphasis>don't</emphasis> hit <guilabel>Scan</guilabel> right away, rather <guilabel>Options</guilabel>. An additional area will fold out organized with three tabs. In <guilabel>Albums</guilabel> you can confine the scan to certain albums and/or tags. In <guilabel>Parameters</guilabel> you can try to find a balance between speed and accuracy that suits your needs. Under <guilabel>Advanced</guilabel> you will find for checkboxes. The first is explained by the text above it. The second is for face recognition, see next article.
+            </para>
+            
+            <para>
+                Once you have choosen your options carefully you click <guilabel>Scan</guilabel> and after a while, depending on the scope of your selection, the result will be presented in the Image Area. In the Tags list of the Left Sidebar you will see the People branch of your tag tree. You will see the whole scan result only if the topmost tag <quote>People</quote> is selected. In the tree you will see a new virtual tag called <quote>Unknown</quote> which will show all those images where faces are recognized but not yet connected to a person. If you just scanned for the first time you will find the whole result also here.
+            </para>
+            
+            <para>
+                <example>
+                    <title>Face Recognition result</title>
+                    <mediaobject>
+                        <imageobject><imagedata fileref="&path;using-mainwindow-facedetection.png" format="PNG" /></imageobject>
+                    </mediaobject>
+                </example>
+            </para>
+            
+            <para>
+                Note that the thumbnails presented here are not showing the whole image. They show the area of the image where the scan algorithm put down a <firstterm>Face Tag</firstterm>. You can see that if you click on the thumbnail. In the preview that opens then you will see the whole image with all the face tags on them. If you don't see them, click the <mediaobject>
+                    <imageobject><imagedata fileref="&path;using-mainwindow-icon-showfacetags.png" format="PNG" /></imageobject>
+                </mediaobject> 
+                in the upper left corner of the preview. If there is more than one face tag on the image it will also be represented by more than one thumbnail. In the screenshot above this is the case with the two topmost thumbnails.
+            </para>
+
+            <para>
+                <mediaobject>
+                    <imageobject><imagedata fileref="&path;using-mainwindow-facedetectiontag.png" format="PNG" /></imageobject>
+                </mediaobject>
+            </para>
+            
+            <para>
+                I have choosen this image for the screenshot because it shows one important issue: the algorithm will find inevitably details in an image that resemble a face but are actually something else. That's what the <guilabel>Remove</guilabel> button is for. It will remove the face tag from the photograph and if it is the only face tag (left) the photograph will disappear from the scan result.
+            </para>
+            
+            <para>
+                If it really is a face the field labeled "Who is this?" comes into play. Here you can either type in the name of an existing People tag out of your tag tree or use the drop down function to show your tag tree and select a tag. With <guilabel>Confirm</guilabel> you can save that to the database. If it was the only face tag (left) the image will disappear from the <quote>Unknown</quote> selection and you will find it once you select either the <quote>People</quote> tag or one of the tags you assigned to one of the face tags in that image.
+            </para>
+            
+            <para>
+                In the context menu of the preview there are two more items related to face tags: <guilabel>Add a Face Tag</guilabel> and <guilabel>Clear all faces on this image</guilabel>.
             </para>
 
         </sect3>
@@ -648,7 +820,9 @@
         <sect3> <title>Face Recognition</title>
 
             <para>
-                TODO
+                Assigning People tags to face tags is an important prerequisite to Face Recognition. Very obviously &digikam; can only recognize faces if it has something to compare with. So it's up to you to show it the ropes. 
+                
+                If a face tag is confirmed and thus showing only the name of the tag but not the buttons to remove, edit or confirm it, but you need this buttons because ⪚ it's wrong and you want to edit or remove it, just double-click on the name and the buttons will re-appear.
             </para>
 
         </sect3>
diff --git a/digikam/using-sidebar-captions.docbook b/digikam/using-sidebar-captions.docbook
index 30966e4..65b5828 100644
--- a/digikam/using-sidebar-captions.docbook
+++ b/digikam/using-sidebar-captions.docbook
@@ -91,7 +91,7 @@
 
     </sect3>
 
-    <sect3>
+    <sect3 id="using-sidebar-tags">
     <title>Tag Tree</title>
 
         <para>


More information about the kde-doc-english mailing list