diff --git a/digikam/editor-cm-connection.docbook b/digikam/editor-cm-connection.docbook
index 677fcf8..7a54f29 100644
--- a/digikam/editor-cm-connection.docbook
+++ b/digikam/editor-cm-connection.docbook
@@ -104,11 +104,11 @@
             </para></listitem>
 
             <listitem><para>
-                AdobeRGB, Adobe WideGamutRGB, and Kodak/Adobe ProPhotoRGB (Kodak and Adobe ProPhoto are the same, just branded differently) and their <ulink url="http://www.behrmann.name/index.php?option=com_content&amp;task=view&amp;id=34&amp;Itemid=68">non-branded, non-copyrighted</ulink> counterparts (Oyranos includes a non-branded version of AdobeRGB.
+                AdobeRGB, Adobe WideGamutRGB, and Kodak/Adobe ProPhotoRGB (Kodak and Adobe ProPhoto are the same, just branded differently) and their <ulink url="http://www.behrmann.name/index.php?option=com_content&amp;task=view&amp;id=34&amp;Itemid=68">non-branded, non-copyrighted</ulink> counterparts (Oyranos includes a non-branded version of AdobeRGB).
             </para></listitem>
 
             <listitem><para>
-                And quite a few others that could be added to this list are all more or less suitable as working spaces. Which working space you should use depends only and solely on YOU, on YOUR requirements as the editor of YOUR digital images with YOUR eventual output intentions (web, fine art print, etc).
+                And quite a few others that could be added to this list are all more or less suitable as working spaces. Which working space you should use depends only and solely on YOU, on YOUR requirements as the editor of YOUR digital images with YOUR eventual output intentions (web, fine art print, &etc;).
             </para></listitem>
 
         </orderedlist>
@@ -186,7 +186,7 @@
         </para>
 
         <para>
-            But keeping all the possible colors comes at a price.  It seems that any given digital image (pictures of daffodils with saturated yellows being one common exception) likely only contains a small subset of all the possible visible colors that your camera is capable of capturing.  This small subset is easily contained in one of the smaller working spaces.  Using a very large working space mean that editing your image (applying curves, saturation, etc) can easily produce colors that your eventual output device (printer, monitor) simply cannot display.  So the conversion from your working space to your output device space (say your printer) will have to remap the out of gamut colors in your edited image, some of which might even be totally imaginary, to your printer color space with its much smaller gamut, leading to inaccurate colors at best and at worst to banding (posterization - gaps in what should be a smooth color transition, say, across an expanse of blue sky) and clipping (your carefully crafted muted transitions across delicate shades of red, for example, might get remapped to a solid block of dull red after conversion to your printer's color space).
+            But keeping all the possible colors comes at a price.  It seems that any given digital image (pictures of daffodils with saturated yellows being one common exception) likely only contains a small subset of all the possible visible colors that your camera is capable of capturing.  This small subset is easily contained in one of the smaller working spaces.  Using a very large working space mean that editing your image (applying curves, saturation, &etc;) can easily produce colors that your eventual output device (printer, monitor) simply cannot display.  So the conversion from your working space to your output device space (say your printer) will have to remap the out of gamut colors in your edited image, some of which might even be totally imaginary, to your printer color space with its much smaller gamut, leading to inaccurate colors at best and at worst to banding (posterization - gaps in what should be a smooth color transition, say, across an expanse of blue sky) and clipping (your carefully crafted muted transitions across delicate shades of red, for example, might get remapped to a solid block of dull red after conversion to your printer's color space).
         </para>
 
         <para>
diff --git a/digikam/editor-cm-definitions.docbook b/digikam/editor-cm-definitions.docbook
index 68a882d..0a4cbd0 100644
--- a/digikam/editor-cm-definitions.docbook
+++ b/digikam/editor-cm-definitions.docbook
@@ -66,7 +66,7 @@
     </orderedlist>
 
     <para>
-        And quite a few other working spaces that could be added to this list, are all more or less suitable as working spaces. Which working space you should use depends only and solely on you, on your requirements as the editor of your digital images with your eventual output intentions (web, fine art print, etc). However, as a critical aside, if you are using Adobe or other copyrighted working space profiles, these profiles contain copyright information that shows up in your image exif information. Lately I've been perusing the openicc mailing lists. Apparently LCMS can be used to produce nonbranded, copyleft working space profiles that are just the same as - actually indistinguishable from - the branded, copyrighted working space profiles. It would be a wonderful addition to &digikam; if a set of "copyleft" working space profiles, including nonbranded, relabelled versions of ProPhotoRGB, AdobeRGB, and Adobe WidegamutRGB (perhaps in two flavors each: linear gamma and the usual gamma), could be bundled as part of the &digikam; package.
+        And quite a few other working spaces that could be added to this list, are all more or less suitable as working spaces. Which working space you should use depends only and solely on you, on your requirements as the editor of your digital images with your eventual output intentions (web, fine art print, &etc;). However, as a critical aside, if you are using Adobe or other copyrighted working space profiles, these profiles contain copyright information that shows up in your image exif information. Lately I've been perusing the openicc mailing lists. Apparently LCMS can be used to produce nonbranded, copyleft working space profiles that are just the same as - actually indistinguishable from - the branded, copyrighted working space profiles. It would be a wonderful addition to &digikam; if a set of "copyleft" working space profiles, including nonbranded, relabelled versions of ProPhotoRGB, AdobeRGB, and Adobe WidegamutRGB (perhaps in two flavors each: linear gamma and the usual gamma), could be bundled as part of the &digikam; package.
     </para>
 
 </sect2>
diff --git a/digikam/editor-cm-monitor.docbook b/digikam/editor-cm-monitor.docbook
index c5028f1..1e1cccf 100644
--- a/digikam/editor-cm-monitor.docbook
+++ b/digikam/editor-cm-monitor.docbook
@@ -26,7 +26,7 @@
         </para>
 
         <para>
-            If your monitor gamma is improperly set, your tonal variations from dark to light will be off. That is, the shadows or highlights might be overly compressed or expanded, leading you to compensate in the opposite direction. So when viewed on a properly calibrated monitor, the shadows might be too bright or dark (or the highlights too dark or bright), with the rest of the image suffering from tonal over-compression. And heaven help you if the internal R, G, and B guns (or LCD equivalent) of your monitor are improperly set (each gun has its own black point and gain), because the resulting color casts - too green, too magenta, too orange, etc, that you will inevitably create by "correcting" your image during editing - are very obvious when viewed on a properly calibrated monitor.
+            If your monitor gamma is improperly set, your tonal variations from dark to light will be off. That is, the shadows or highlights might be overly compressed or expanded, leading you to compensate in the opposite direction. So when viewed on a properly calibrated monitor, the shadows might be too bright or dark (or the highlights too dark or bright), with the rest of the image suffering from tonal over-compression. And heaven help you if the internal R, G, and B guns (or LCD equivalent) of your monitor are improperly set (each gun has its own black point and gain), because the resulting color casts - too green, too magenta, too orange, &etc; that you will inevitably create by "correcting" your image during editing - are very obvious when viewed on a properly calibrated monitor.
         </para>
 
         <para>
diff --git a/digikam/editor-cm-rawfile.docbook b/digikam/editor-cm-rawfile.docbook
index 2bdddf2..64fe1b6 100644
--- a/digikam/editor-cm-rawfile.docbook
+++ b/digikam/editor-cm-rawfile.docbook
@@ -28,7 +28,7 @@
         </para>
 
         <para>
-            Libraw (which &digikam; uses to convert raw files to image files) doesn't add an S-curve to your image tonality. Libraw gives you the lights and darks that are actually recorded by the camera sensor. According to <ulink url="http://21stcenturyshoebox.com/essays/scenereferredworkflow.html">Tindeman</ulink>, an excellent read and source of good advice, with links to equally good sources of additional information), dcraw is one of only a handful of raw developers that actually gives you the "scene-referred" tonality. Ufraw also produces a scene-referred image by default (although ufraw gives the user the option to modify the scene-referred image by changing the tonal distribution and saturation). And the dcraw/ufraw scene-referred image IS flat-looking, because the camera sensor records light linearly, whereas our eyes are constantly interacting with our brain to accommodate dim and bright areas in a scene, meaning our brain to some extent "applies an S-curve" to the scene to enable us to better focus in on the areas of particular interest as we look around
+            Libraw (which &digikam; uses to convert raw files to image files) doesn't add an S-curve to your image tonality. Libraw gives you the lights and darks that are actually recorded by the camera sensor. According to <ulink url="http://21stcenturyshoebox.com/essays/scenereferredworkflow.html">Tindeman</ulink>, an excellent read and source of good advice, with links to equally good sources of additional information, dcraw is one of only a handful of raw developers that actually gives you the "scene-referred" tonality. Ufraw also produces a scene-referred image by default (although ufraw gives the user the option to modify the scene-referred image by changing the tonal distribution and saturation). And the dcraw/ufraw scene-referred image IS flat-looking, because the camera sensor records light linearly, whereas our eyes are constantly interacting with our brain to accommodate dim and bright areas in a scene, meaning our brain to some extent "applies an S-curve" to the scene to enable us to better focus in on the areas of particular interest as we look around
         </para>
 
     </sect3>
@@ -39,11 +39,11 @@
         </title>
 
         <para>
-            When you take a picture, presumably you have an idea of what you want the final image to look like.  It is much easier to achieve that final image if you don't have to "undo" stuff that has already been done to your image.  Once Canon (or Nikon, or Bibble, or etc) has applied their proprietary S-curves and shadow-denoising, sharpening, etc to your image, then your shadows, highlights, edge detail, etc, are already squashed, clipped, chopped, and otherwise altered and mangled.  You've thrown information away and you cannot get it back.  Especially in the shadows, even with 16-bit images (actually, 12- or 14-bits, depending on the camera, but it's encoded as 16-bits for the computer's convenience), there just isn't that much information to begin with.
+            When you take a picture, presumably you have an idea of what you want the final image to look like.  It is much easier to achieve that final image if you don't have to "undo" stuff that has already been done to your image.  Once Canon (or Nikon, or Bibble, &etc;) has applied their proprietary S-curves and shadow-denoising, sharpening, &etc; to your image, then your shadows, highlights, edge detail, &etc; are already squashed, clipped, chopped, and otherwise altered and mangled.  You've thrown information away and you cannot get it back.  Especially in the shadows, even with 16-bit images (actually, 12- or 14-bits, depending on the camera, but it's encoded as 16-bits for the computer's convenience), there just isn't that much information to begin with.
         </para>
 
         <para>
-            It seems to me that the heart and soul of image processing is the deliberate manipulation of image tonality, color, selective sharpening, and so forth, such that the viewer focuses in on what you, the photographer, found of particular interest when you took the picture. Why give the art of image processing over to some proprietary raw processing software?  In other words, "flat is good" if you'd rather give your images your own artistic interpretation.  The alternative is to let the canned, proprietary algorithms produced by Canon, Nikon, Bibble, etc interpret your images for you.  (On the other hand, there is no denying that for many images, those canned algorithms are really pretty good!)
+            It seems to me that the heart and soul of image processing is the deliberate manipulation of image tonality, color, selective sharpening, and so forth, such that the viewer focuses in on what you, the photographer, found of particular interest when you took the picture. Why give the art of image processing over to some proprietary raw processing software?  In other words, "flat is good" if you'd rather give your images your own artistic interpretation.  The alternative is to let the canned, proprietary algorithms produced by Canon, Nikon, Bibble, &etc; interpret your images for you.  (On the other hand, there is no denying that for many images, those canned algorithms are really pretty good!)
         </para>
 
     </sect3>
@@ -62,7 +62,7 @@
         </para>
 
         <para>
-            If the image isn't dark but it looks really weird, probably you made some injudicious choices in the Libraw user-interface.   The Libraw interface conveniently allows you to "dial in" options that you would otherwise have to specify at the command line. However, convenience always comes at a price.  First, the interface might not provide access to all the options that are available at the command line. And second, to get the most from the Libraw interface, you have to know what the buttons, sliders, etc in the interface actually do. Which means you need to know what happens at the command line if you want to get the best results from using the interface. (This tutorial will not attempt to document how to use the Libraw user interface. Digikam is developing at a rapid pace and anything I might write about the Libraw interface will surely be outdated in the near future.)
+            If the image isn't dark but it looks really weird, probably you made some injudicious choices in the Libraw user-interface.   The Libraw interface conveniently allows you to "dial in" options that you would otherwise have to specify at the command line. However, convenience always comes at a price.  First, the interface might not provide access to all the options that are available at the command line. And second, to get the most from the Libraw interface, you have to know what the buttons, sliders, &etc; in the interface actually do. Which means you need to know what happens at the command line if you want to get the best results from using the interface. (This tutorial will not attempt to document how to use the Libraw user interface. Digikam is developing at a rapid pace and anything I might write about the Libraw interface will surely be outdated in the near future.)
         </para>
 
         <para>
diff --git a/digikam/editor-cm-wkspace.docbook b/digikam/editor-cm-wkspace.docbook
index 44e088c..79940ac 100644
--- a/digikam/editor-cm-wkspace.docbook
+++ b/digikam/editor-cm-wkspace.docbook
@@ -104,7 +104,7 @@
         </para>
 
         <para>
-            Using a very large working space means that editing your image (applying curves, increasing saturation, etc) can easily produce colors that your eventual output device (printer, monitor) simply cannot reproduce (you cannot see these colors while you're editing, either). So the conversion from your working space to your output device space (say your printer) will have to remap the out-of-gamut colors in your edited image, some of which might even be totally imaginary, to your printer color space with its much smaller color gamut. This remapping process will lead to inaccurate colors and loss of saturation at best. Even worse, the remapping can easily lead to banding (posterization - gaps in what should be a smooth color transition, say, across an expanse of blue sky) and clipping (e.g your carefully crafted muted transitions across delicate shades of red, for example, might get remapped to a solid block of dull red after conversion to your printer's color space). Also, the experts say that 8-bit images just don't have enough tones to stretch across a wide gamut working space without banding and loss of saturation, even before conversion to an output space. So if you choose a large gamut working space, make sure you start with a 16-bit image.
+            Using a very large working space means that editing your image (applying curves, increasing saturation, &etc;) can easily produce colors that your eventual output device (printer, monitor) simply cannot reproduce (you cannot see these colors while you're editing, either). So the conversion from your working space to your output device space (say your printer) will have to remap the out-of-gamut colors in your edited image, some of which might even be totally imaginary, to your printer color space with its much smaller color gamut. This remapping process will lead to inaccurate colors and loss of saturation at best. Even worse, the remapping can easily lead to banding (posterization - gaps in what should be a smooth color transition, say, across an expanse of blue sky) and clipping (&eg; your carefully crafted muted transitions across delicate shades of red, for example, might get remapped to a solid block of dull red after conversion to your printer's color space). Also, the experts say that 8-bit images just don't have enough tones to stretch across a wide gamut working space without banding and loss of saturation, even before conversion to an output space. So if you choose a large gamut working space, make sure you start with a 16-bit image.
         </para>
 
         <para>
diff --git a/digikam/editor-color-auto.docbook b/digikam/editor-color-auto.docbook
index 7ec6561..5479863 100644
--- a/digikam/editor-color-auto.docbook
+++ b/digikam/editor-color-auto.docbook
@@ -14,17 +14,29 @@
 
     <para>
 
-        The <guilabel>Normalize</guilabel>, <guilabel>Equalize</guilabel>, <guilabel>Auto Levels</guilabel>, and <guilabel>Stretch Contrast</guilabel>
-        available from <menuchoice><guilabel>Correct</guilabel><guimenuitem>Auto-Correction</guimenuitem></menuchoice> menu entry menu will attempt to 
-        work out the best color levels automatically. You will need to experiment with the effects of these functions to see what works best with your photograph.
+        The <guilabel>Auto Levels</guilabel>, <guilabel>Normalize</guilabel>, <guilabel>Equalize</guilabel>, <guilabel>Stretch Contrast</guilabel>, and <guilabel>Auto Exposure</guilabel> available from <menuchoice><guilabel>Correct</guilabel><guimenuitem>Auto-Correction...</guimenuitem></menuchoice> menu entry menu will attempt to work out the best color levels automatically. You will need to experiment with the effects of these functions to see what works best with your photograph.
 
         <itemizedlist>
 
+            <listitem>
+                <para>
+                    <guilabel>Auto Levels</guilabel>: TODO.
+
+                    <!-- <example>
+                        <title>Auto Levels Correction Preview</title>
+                        <screenshot><screeninfo>Auto Levels Correction Preview</screeninfo>
+                            <mediaobject><imageobject><imagedata fileref="&path;editor-auto-levels.png" format="PNG" /> </imageobject></mediaobject>
+                        </screenshot>
+                        </example> -->
+
+                </para>
+            </listitem>
+
             <listitem>
                 <para>
                     <guilabel>Normalize</guilabel>: this method scales brightness values across the selected image so that the darkest 
                     point becomes black, and the brightest point becomes as bright as possible without altering its hue. 
-                    This is often a "magic fix" for images that are dim or washed out.
+                    This is often a <quote>magic fix</quote> for images that are dim or washed out.
 
                     <example>
                         <title>Normalize Colors Correction Preview</title>
diff --git a/digikam/editor-color-bw.docbook b/digikam/editor-color-bw.docbook
index 15c41b4..118b115 100644
--- a/digikam/editor-color-bw.docbook
+++ b/digikam/editor-color-bw.docbook
@@ -16,9 +16,9 @@
 
         <para>
             &digikam; comes with a couple of black &amp; white filters that you can use on your photographs. 
-            Under the <menuchoice><guimenuitem>Filters</guimenuitem><guimenuitem>Black &amp; White</guimenuitem></menuchoice> menu 
+            Under the <menuchoice><guimenuitem>Color</guimenuitem><guimenuitem>Black &amp; White...</guimenuitem></menuchoice> menu 
             you will find classic black &amp; white chemical toning used in analog photography. 
-            The controls come on three tabs: <emphasis>Film, Lens Filters, Tone</emphasis> and <emphasis>Lightness</emphasis> as shown on the screenshot below. 
+            The controls come on four drop-down items: <emphasis>Film, Lens Filters, Tone</emphasis> and <emphasis>Lightness</emphasis> as shown on the screenshot below. 
             Film, filters and color toning can be applied independently of each other (on top of each other). 
             The filters actually influence the RGB channel mixing, whereas the toning purely adds a uniform monochromatic tint to the black &amp; white photograph. 
             In the lightness tab you will find a tonal adjustment tool (like curve adjust), a contrast tool and an over-exposure indicator to improve the b&amp;w rendering.
@@ -29,6 +29,7 @@
             <title>The Black &amp; White Filter tool in Action</title>
             <screenshot>
                 <screeninfo>The B&amp;W Filter tool in Action</screeninfo>
+                <!-- TODO: need a new screenshot -->
                 <mediaobject><imageobject><imagedata fileref="&path;editor-bwfilter.png" format="PNG" /> </imageobject></mediaobject>
             </screenshot>
 
@@ -50,9 +51,10 @@
 
                 <entry>
                 <para>Specific settings to emulate a number of famous black &amp; white photographic films are available:</para>
+                <para>Generic</para>
                 <para>Agfa 200X, Agfa Pan 25, Agfa Pan 100, Agfa Pan 400</para>
-                <para>Ilford Delta 100, Ilford Delta 400, Ilford Delta 400 Pro 3200, Ilford FP4 Plus, Ilford HP5 Plus, Ilford PanF Plus, Ilford XP2 Super</para>
-                <para>Kodak Tmax 100, Kodak Tmax 400, Kodak TriX</para>
+                <para>Ilford Delta 100, Ilford Delta 400, Ilford Delta 400 Pro 3200, Ilford FP4 Plus, Ilford HP5 Plus, Ilford PanF Plus, Ilford XP2 Super, Ilford SPX 200 (Infrared), Ilford SPX 400 (Infrared), Ilford SPX 800 (Infrared)</para>
+                <para>Kodak Tmax 100, Kodak Tmax 400, Kodak TriX, Kodak HIE (Infrared)</para>
                 </entry>
             </row>
         </tbody>
@@ -80,7 +82,7 @@
                 </entry>
 
                 <entry>
-                Neutral: simulate black &amp; white neutral film exposure.
+                No Lens Filter: simulate black &amp; white neutral film exposure.
                 </entry>
             </row>
 
@@ -123,6 +125,26 @@
                 Yellow Filter: simulates black &amp; white film exposure with yellow lens filter. Most natural tonal correction, improves contrast. Ideal for landscapes (similar to 001 Cokin(tm) Yellow filter).
                 </entry>
             </row>
+            <!-- TODO: 
+            <row>
+                <entry>
+                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-bwyellowgreen.png" format="PNG" /> </imageobject></inlinemediaobject>
+                </entry>
+
+                <entry>
+                Yellow-Green Filter: TODO.
+                </entry>
+            </row>
+
+            <row>
+                <entry>
+                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-bwblue.png" format="PNG" /> </imageobject></inlinemediaobject>
+                </entry>
+
+                <entry>
+                Blue Filter: TODO.
+                </entry>
+            </row> -->
 
         </tbody>
 
@@ -131,7 +153,7 @@
         <informaltable><tgroup cols="2">
 
         <thead><row>
-            <entry>Preview</entry> <entry>Color Tint</entry>
+            <entry>Preview</entry> <entry>Hue (Color Tint)</entry>
         </row></thead>
 
         <tbody>
@@ -141,7 +163,7 @@
                 </entry>
 
                 <entry>
-                Sepia Tone: gives a warm highlight and mid-tone while adding a bit of coolness to the shadows - very similar to the process of bleaching a print and re-developing in a sepia toner (typical for your grandmothers photographs). Similar to 005 Cokin(tm) Sepia filter.
+                Sepia Filter: gives a warm highlight and mid-tone while adding a bit of coolness to the shadows - very similar to the process of bleaching a print and re-developing in a sepia toner (typical for your grandmothers photographs). Similar to 005 Cokin(tm) Sepia filter.
                 </entry>
             </row>
 
@@ -151,7 +173,7 @@
                 </entry>
 
                 <entry>
-                Brown Tone: similar to Sepia Tone filter, but less pronounced.
+                Brown Filter: similar to Sepia Tone filter, but less pronounced.
                 </entry>
             </row>
 
@@ -161,29 +183,39 @@
                 </entry>
 
                 <entry>
-                Cold Tone: start subtle and replicate printing on a cold tone black &amp; white paper such as a bromide enlarging paper.
+                Cold Filter: start subtle and replicate printing on a cold tone black &amp; white paper such as a bromide enlarging paper.
                 </entry>
             </row>
 
             <row>
                 <entry>
-                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-platinium.png" format="PNG" /> </imageobject></inlinemediaobject>
+                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-selenium.png" format="PNG" /> </imageobject></inlinemediaobject>
                 </entry>
 
                 <entry>
-                Platinum Tone: effect that replicates traditional platinum chemical toning done in the darkroom.
+                Selenium Filter: effect that replicates traditional selenium chemical toning done in the darkroom.
                 </entry>
             </row>
 
             <row>
                 <entry>
-                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-selenium.png" format="PNG" /> </imageobject></inlinemediaobject>
+                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-platinium.png" format="PNG" /> </imageobject></inlinemediaobject>
                 </entry>
 
                 <entry>
-                Selenium Tone: effect that replicates traditional selenium chemical toning done in the darkroom.
+                Platinum Filter: effect that replicates traditional platinum chemical toning done in the darkroom.
                 </entry>
             </row>
+            <!-- TODO:
+            <row>
+                <entry>
+                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-green.png" format="PNG" /> </imageobject></inlinemediaobject>
+                </entry>
+
+                <entry>
+                Green Filter: TODO.
+                </entry>
+            </row> -->
 
         </tbody>
 
@@ -201,13 +233,14 @@
             conversion. Contrast and an abstract touch are improved, which can underpin the expression 
             of the photographer as an artist.
 
-            It is like taking an image in black and white with a red filter on the camera lenses. 
+            It is like taking an image in black and white with a red filter on the camera lense. 
             Areas which reflect little red light, &eg; the sky, will show as low density, dark areas. 
-            Areas which are excellent reflectors of red light, e.g. most green foliage, will be high 
+            Areas which are excellent reflectors of red light, &eg; most green foliage, will be high 
             density areas. And snow landscapes are really dramatic.
         </para>
 
         <para>
+            <!-- TODO: https://www.gimp.org/news/2015/01/22/gimpguruorg-rip/ - without link -->
             The algorithm is based on the method of the 'Simulate Infrared Film' tutorial of the GimpGuru.org 
             web site available at <ulink url="http://www.gimpguru.org/Tutorials/SimulatedInfrared">this url</ulink>.
             The filter tries to reproduce the famous Ilford(tm) SFX infrared film series. 
diff --git a/digikam/editor-color-correction.docbook b/digikam/editor-color-correction.docbook
index 1e6cb8a..587b275 100644
--- a/digikam/editor-color-correction.docbook
+++ b/digikam/editor-color-correction.docbook
@@ -25,7 +25,7 @@
 
     <para>
         If your image is washed out (which can easily happen when you take images in bright light) try the Hue/Saturation/Lightness tool, 
-        which gives you three sliders to manipulate, for Hue, Saturation, and Lightness. 
+        which gives you four sliders to manipulate, for Hue, Saturation, Vibrance, and Lightness. 
         Raising the saturation will probably make the image look better. In some cases, it is useful to adjust the lightness at the same time. 
         ("Lightness" here is similar to "Brightness" in the Brightness/Contrast/Gamma tool, except that they are formed from different combinations 
         of the red, green, and blue channels).
diff --git a/digikam/editor-color-curves.docbook b/digikam/editor-color-curves.docbook
index 1575ad4..48ab79b 100644
--- a/digikam/editor-color-curves.docbook
+++ b/digikam/editor-color-curves.docbook
@@ -14,13 +14,13 @@
     <title>Introduction</title>
 
     <para>
-    The Curves tool is the most sophisticated tool available to adjust the images' tonality. Start it from the <menuchoice><guimenu>Color</guimenu> <guimenuitem>Curves Adjust</guimenuitem></menuchoice> Image Editor menu.
-    It allows you to click and drag control points on a curve to create a free function mapping input brightness levels to output brightness levels. The Curves tool can replicate any effect you can achieve with Brightness/Contrast/Gamma or the Adjust Levels tool, though it is more powerful than either one of them.
+    The Adjust Curves tool is the most sophisticated tool available to adjust the images' tonality. Start it from the <menuchoice><guimenu>Color</guimenu> <guimenuitem>Curves Adjust...</guimenuitem></menuchoice> Image Editor menu.
+    It allows you to click and drag control points on a curve to create a free function mapping input brightness levels to output brightness levels. The Adjust Curves tool can replicate any effect you can achieve with Brightness/Contrast/Gamma or the Adjust Levels tool, though it is more powerful than either one of them.
 
     But this tool can do more for you, it helps you to improve the tonal quality of your photographs to very finely stepped gray scales. And do not forget that the better the photographs are (good exposure, lossless format, 24 or 32 bit deep) the more you can improve them. Navigate to the "Achieving ultimate tonal quality" section of this instructive page: <ulink url="http://www.normankoren.com/digital_tonality.html">Tonal quality and dynamic range in digital cameras by Norman Koren</ulink>. Use Adjust Curves tool to do just the same!
     </para>
     <para>
-    This tool provides visual curves to modify the intensity values of the active layer displayed as a histogram non-linearily. In <guilabel>Smooth</guilabel> curve edition mode, you change the curves shape by adding new points to the curve or by moving end point positions. Another mode is to draw all the curve manually in <guilabel>Free</guilabel> curve edition mode. In both cases the effect is immediately displayed in the image preview area to the left, where the preview can be configured by clicking on the top left icons.
+    This tool provides visual curves to modify the intensity values of the active layer displayed as a histogram non-linearily. In <guilabel>Curve smooth mode</guilabel>, you change the curves shape by adding new points to the curve or by moving end point positions. Another way, is to draw all the curve manually in <guilabel>Curve free mode</guilabel>. In both cases the effect is immediately displayed in the image preview area to the left, where the preview can be configured by clicking on the top left icons.
     </para>
 
         <sect4 id="using-adjustcurves">
@@ -58,15 +58,15 @@
         </para></listitem>
 
         <listitem><para>
-        Curve <guilabel>Type</guilabel> for channel : below the editing area are several icons that determine whether the curve can be edited using a <guilabel>Smooth</guilabel> curve or a <guilabel>Free</guilabel> hand mode curve. Smooth mode constrains the curve type to a smooth line with tension and provides a realistic rendering. Free mode lets you draw your curve free-hand with the mouse. With curve segments scattered all over the grid, result will be surprising but hardly repeatable. A reset-to-defaults button is also available.
+        Curve <guilabel>Type</guilabel> for channel : below the editing area are several icons that determine whether the curve can be edited using a <guilabel>Curve smooth mode</guilabel> curve or a <guilabel>Curve free mode</guilabel>. Smooth mode constrains the curve type to a smooth line with tension and provides a realistic rendering. Free mode lets you draw your curve free-hand with the mouse. With curve segments scattered all over the grid, result will be surprising but hardly repeatable. A reset-to-defaults button is also available.
         </para></listitem>
 
         <listitem><para>
-        If, for example, you move a curve segment to the right, i.e. to highlights, you can see that these highlights are corresponding to darker output tones and that image pixels corresponding to this curve segment will go darker.
+        If, for example, you move a curve segment to the right, &ie; to highlights, you can see that these highlights are corresponding to darker output tones and that image pixels corresponding to this curve segment will go darker.
         </para></listitem>
 
         <listitem><para>
-        With color channels, moving right will decrease saturation up to reaching complementary color. To delete all control points (apart from both end points), click on the <guilabel>Reset Values</guilabel> button. To delete only one  point, move it onto another point. Just ply with the curves and watch the results. You even can solarize the image on part of its tonal range. This happens when the curve is inverted in some part.
+        With color channels, moving right will decrease saturation up to reaching complementary color. To delete all control points (apart from both end points), click on the <guilabel>Reset</guilabel> button. To delete only one  point, move it onto another point. Just ply with the curves and watch the results. You even can solarize the image on part of its tonal range. This happens when the curve is inverted in some part.
         </para></listitem>
 
         <listitem><para>
@@ -74,11 +74,11 @@
         </para></listitem>
 
         <listitem><para>
-        <guilabel>Save As</guilabel> and <guilabel>Load</guilabel>: these buttons are used to do just that. Any curves that you have set can be saved to the filesystem and loaded later. The used file format is The Gimp Curves format.
+        <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel>: these buttons are used to do just that. Any curves that you have set can be saved to the filesystem and loaded later. The used file format is The Gimp Curves format.
         </para></listitem>
 
         <listitem><para>
-        <guilabel>Reset All</guilabel>: this button resets all curve values for all channels.
+        <guilabel>Reset</guilabel>: this button resets all curve values for all channels.
         </para></listitem>
 
         </itemizedlist>
@@ -90,12 +90,12 @@
         </para>
 
         <para>
-        Using this way and the three <guilabel>Color Picker</guilabel> buttons will automatically create control points on the curve in all channels for shadow, middle, and highlight tones. Enable the color picker button that you want to use, and click on the original image preview area to produce control points on each of the Red, Green, Blue, and Luminosity control curves.
+        Using this way and the three <guilabel>Tone Color Picker</guilabel> buttons will automatically create control points on the curve in all channels for shadow, middle, and highlight tones. Enable the color picker button that you want to use, and click on the original image preview area to produce control points on each of the Red, Green, Blue, and Luminosity control curves.
         </para>
-
+        <!-- TODO: digiKam 5.6.0 - this option does not exist (new screenshot)
         <para>
         <guilabel>Over Exposure Indicator</guilabel> option adds up all color channels and indicates the blown-out highlights. If more than one channel in a pixel is over-exposed you will see the combined color resulting from the curve settings. The display is an indicator only and has no effect on the final rendering.
-        </para>
+        </para> -->
 
         </sect4>
 
diff --git a/digikam/editor-color-levels.docbook b/digikam/editor-color-levels.docbook
index 1b59087..e152385 100644
--- a/digikam/editor-color-levels.docbook
+++ b/digikam/editor-color-levels.docbook
@@ -100,7 +100,7 @@
             <listitem><para><guilabel>Auto</guilabel>: this button performs an automatic setting of the
             levels based on the pixel intensities of the image.</para></listitem>
 
-            <listitem><para><guilabel>Save As</guilabel> and <guilabel>Load</guilabel>: these buttons are used
+            <listitem><para><guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel>: these buttons are used
             to do just that. Any Levels that you have set can be saved to the filesystem and loaded later.
             The used file format is The Gimp Levels format.</para></listitem>
 
diff --git a/digikam/editor-color-mixer.docbook b/digikam/editor-color-mixer.docbook
index 3687db2..d3a637c 100644
--- a/digikam/editor-color-mixer.docbook
+++ b/digikam/editor-color-mixer.docbook
@@ -42,7 +42,7 @@
     </para></note>
 
     <para>
-    <guilabel>Save As</guilabel> and <guilabel>Load</guilabel> buttons are used to do just that. Any mixer settings that you have set can be saved to the filesystem and loaded later. The used file format is The Gimp channel mixer format.
+    <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel> buttons are used to do just that. Any mixer settings that you have set can be saved to the filesystem and loaded later. The used file format is The Gimp channel mixer format.
     </para>
 
     <para>
diff --git a/digikam/editor-color-wb.docbook b/digikam/editor-color-wb.docbook
index 82088e1..454caea 100644
--- a/digikam/editor-color-wb.docbook
+++ b/digikam/editor-color-wb.docbook
@@ -228,7 +228,7 @@
     </para>
 
     <para>
-    <guilabel>Save As</guilabel> and <guilabel>Load</guilabel> buttons are used to do just that. Any White Color Balance settings that you have set can be saved to the filesystem in a text file and loaded later.
+    <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel> buttons are used to do just that. Any White Color Balance settings that you have set can be saved to the filesystem in a text file and loaded later.
     </para>
 
     <para>
diff --git a/digikam/editor-color.docbook b/digikam/editor-color.docbook
index 7bd851b..cd47260 100644
--- a/digikam/editor-color.docbook
+++ b/digikam/editor-color.docbook
@@ -19,7 +19,8 @@
             This tool permit to convert image from one color space to another one. 
             Its use is the change and assignment of color profiles to an image. 
             For detailed instructions on the use of color profiles, 
-            please refer to <ulink url="help:/digikam/using-setup.html#setup-iccprofiles">Color Management chapter</ulink>.
+            please refer to <ulink url="help:/digikam/using-setup.html#using-setup-cm">Color 
+            Management Settings chapter</ulink>.
         </para>
 
     </sect3>
diff --git a/digikam/editor-decorate-texture.docbook b/digikam/editor-decorate-texture.docbook
index 9b6eae8..8b320ab 100644
--- a/digikam/editor-decorate-texture.docbook
+++ b/digikam/editor-decorate-texture.docbook
@@ -15,7 +15,7 @@
     <title>Introduction</title>
 
     <para>
-        By adding texture to your image, whether color or black and white, you can make it look like an oil painting on canvas, an Old Masters etching, a Pop Art portrait composed of enlarged half-tone dots, or even a mural on a brick wall. The <menuchoice><guimenu>Image</guimenu>
+        By adding texture to your image, whether color or black and white, you can make it look like an oil painting on canvas, an Old Masters etching, a Pop Art portrait composed of enlarged half-tone dots, or even a mural on a brick wall. The <menuchoice><guimenu>Decorate</guimenu>
         <guimenuitem>Apply Texture</guimenuitem></menuchoice> Image Editor menu can be used for that.
     </para>
 
diff --git a/digikam/editor-enhance-inpaint.docbook b/digikam/editor-enhance-inpaint.docbook
index 1980a68..68302f5 100644
--- a/digikam/editor-enhance-inpaint.docbook
+++ b/digikam/editor-enhance-inpaint.docbook
@@ -48,15 +48,15 @@ The inpainting algorithm has been developed by the IMAGE team of GREC CNRS lab i
           </listitem>
           <listitem>
             <para>
-              <guilabel>Remove Small Area</guilabel>: .</para>
+                <guilabel>Remove Small Area</guilabel>: .</para> <!-- TODO -->
           </listitem>
           <listitem>
             <para>
-              <guilabel>Remove Medium Area</guilabel>: .</para>
+              <guilabel>Remove Medium Area</guilabel>: .</para> <!-- TODO -->
           </listitem>
           <listitem>
             <para>
-              <guilabel>Remove Large Area</guilabel>: .</para>
+              <guilabel>Remove Large Area</guilabel>: .</para> <!-- TODO -->
           </listitem>
         </itemizedlist>
       </para>
@@ -122,7 +122,7 @@ The inpainting algorithm has been developed by the IMAGE team of GREC CNRS lab i
         </itemizedlist>
       </para>
       <para>
-        <guilabel>Save As</guilabel> and <guilabel>Load</guilabel> buttons are used to do just that. Any Photograph Inpainting filter settings that you have set can be saved to the filesystem in a text file and loaded later.
+        <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel> buttons are used to do just that. Any Photograph Inpainting filter settings that you have set can be saved to the filesystem in a text file and loaded later.
 </para>
       <warning>
         <para>
diff --git a/digikam/editor-enhance-nr.docbook b/digikam/editor-enhance-nr.docbook
index 90978ff..36d79d3 100644
--- a/digikam/editor-enhance-nr.docbook
+++ b/digikam/editor-enhance-nr.docbook
@@ -94,7 +94,7 @@ You can see below a full description of all parameters. In most cases only <guil
           </listitem>
           <listitem>
             <para>
-              <guilabel>Save As</guilabel> and <guilabel>Load</guilabel>: these buttons are used to do just that. Any Noise Reduction parameters that you have set can be saved to the filesystem and loaded later.
+              <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel>: these buttons are used to do just that. Any Noise Reduction parameters that you have set can be saved to the filesystem and loaded later.
 </para>
           </listitem>
           <listitem>
diff --git a/digikam/editor-enhance-restoration.docbook b/digikam/editor-enhance-restoration.docbook
index 3bc3d36..25d97d5 100644
--- a/digikam/editor-enhance-restoration.docbook
+++ b/digikam/editor-enhance-restoration.docbook
@@ -125,7 +125,7 @@ The same algorithm can be used for colorization and texture replacement which is
         </itemizedlist>
       </para>
       <para>
-        <guilabel>Save As</guilabel> and <guilabel>Load</guilabel> buttons are used to do just that. Any Photograph Restoration filter settings that you have set can be saved to the filesystem in a text file and loaded later.
+        <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel> buttons are used to do just that. Any Photograph Restoration filter settings that you have set can be saved to the filesystem in a text file and loaded later.
 </para>
       <warning>
         <para>
diff --git a/digikam/editor-enhance-sharpen.docbook b/digikam/editor-enhance-sharpen.docbook
index 3064104..654d889 100644
--- a/digikam/editor-enhance-sharpen.docbook
+++ b/digikam/editor-enhance-sharpen.docbook
@@ -216,7 +216,7 @@
             </listitem>
             <listitem>
                 <para>
-                <guilabel>Save As</guilabel> and <guilabel>Load</guilabel>: these buttons are used to do just that. Any Refocus parameters that you have set can be saved to the filesystem and loaded later.</para>
+                <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel>: these buttons are used to do just that. Any Refocus parameters that you have set can be saved to the filesystem and loaded later.</para>
             </listitem>
             <listitem>
                 <para>
diff --git a/digikam/editor-filters-blurfx.docbook b/digikam/editor-filters-blurfx.docbook
index 16b0724..147a627 100644
--- a/digikam/editor-filters-blurfx.docbook
+++ b/digikam/editor-filters-blurfx.docbook
@@ -69,7 +69,7 @@
 
     <row>
         <entry>
-        <guilabel>Motion Blur</guilabel>: blurs the image by swishing the pixels horizontally. This simulates the blur of a linearly moving camera, i.e. like a shot taken from a car or train.
+        <guilabel>Motion Blur</guilabel>: blurs the image by swishing the pixels horizontally. This simulates the blur of a linearly moving camera, &ie; like a shot taken from a car or train.
         </entry>
                 
         <entry>
diff --git a/digikam/editor-photoediting.docbook b/digikam/editor-photoediting.docbook
index 18d0882..1a8d01f 100644
--- a/digikam/editor-photoediting.docbook
+++ b/digikam/editor-photoediting.docbook
@@ -47,7 +47,7 @@
         <sect3> <title>Introduction to common editing tools features</title>
 
             <para>
-                All Image Editor tools like Sharpen, Blur, Noise Reduction, Refocus, Unsharp Mask, &etc; use a common dialog style that previews the effect before applying the filter to the current image. Below you see the &quot;Apply Texture&quot; tool in action using this common dialog layout:
+                All Image Editor tools like Sharpen, Blur, Noise Reduction, Refocus, Unsharp Mask, &etc; use a common dialog style that previews the effect before applying the filter to the current image. Below you see the <quote>Apply Texture</quote> tool in action using this common dialog layout:
             </para>
 
             <example> <title>The Apply Texture Tool in Action</title>
@@ -71,7 +71,7 @@
 
                         <itemizedlist>
 
-                            <listitem><para>Original image</para></listitem>
+                            <listitem><para>Original image.</para></listitem>
 
                             <listitem>
                                 <para>Split vertically without duplication. The left area shows the original whereas the right side shows the filter applied to the continuation of the selected zoom.</para>
@@ -144,8 +144,8 @@
                     <listitem><para><link linkend="editor-color-curves">Curves Adjust</link></para></listitem>
                     <listitem><para><link linkend="editor-color-mixer">Channel Mixer</link></para></listitem>
                     <listitem><para><link linkend="editor-color-bw">Black and White</link></para></listitem>
-                    <listitem><para><link linkend="infraredtool.anchor">Simulate Infrared Film.</link></para></listitem>
-                    <listitem><para><link linkend="editor-color-neg">Color Negative.</link></para></listitem>
+                    <listitem><para><link linkend="infraredtool.anchor">Simulate Infrared Film</link></para></listitem>
+                    <listitem><para><link linkend="editor-color-neg">Color Negative</link></para></listitem>
                     </itemizedlist>
                 </para></listitem>
 
@@ -188,12 +188,12 @@
                 <listitem><para>Special Effect Filters
                     <itemizedlist>
                     <listitem><para><link linkend="editor-filters-colorsfx">Color Effects</link></para></listitem>
-                    <listitem><para><link linkend="editor-filters-filmgrain">Add Film Grain.</link></para></listitem>
+                    <listitem><para><link linkend="editor-filters-filmgrain">Add Film Grain</link></para></listitem>
                     <listitem><para><link linkend="editor-filters-oilpaint">Simulate Oil Painting</link></para></listitem>
-                    <listitem><para><link linkend="editor-filters-charcoal">Simulate Charcoal Drawing.</link></para></listitem>
-                    <listitem><para><link linkend="editor-filters-emboss">Emboss Photograph.</link></para></listitem>
-                    <listitem><para><link linkend="editor-filters-distortionfx">Distortion FX.</link></para></listitem>
-                    <listitem><para><link linkend="editor-filters-blurfx">Blur FX.</link></para></listitem>
+                    <listitem><para><link linkend="editor-filters-charcoal">Simulate Charcoal Drawing</link></para></listitem>
+                    <listitem><para><link linkend="editor-filters-emboss">Emboss Photograph</link></para></listitem>
+                    <listitem><para><link linkend="editor-filters-distortionfx">Distortion FX</link></para></listitem>
+                    <listitem><para><link linkend="editor-filters-blurfx">Blur FX</link></para></listitem>
                     <listitem><para><link linkend="editor-filters-raindrops">Add Rain Drops</link></para></listitem>
                     </itemizedlist>
                 </para></listitem>
@@ -211,7 +211,7 @@
 
             <itemizedlist>
 
-                <listitem><para>Setting up the RAW conversion and color management preferences
+                <listitem><para>Setting up the RAW conversion and color management preferences:
 
                     <itemizedlist>
 
diff --git a/digikam/editor-transform-crop.docbook b/digikam/editor-transform-crop.docbook
index ee47204..e65ee46 100644
--- a/digikam/editor-transform-crop.docbook
+++ b/digikam/editor-transform-crop.docbook
@@ -32,7 +32,7 @@
             <menuchoice><guimenu>File</guimenu>
             <guimenuitem>Save</guimenuitem></menuchoice> or 
             <menuchoice><guimenu>File</guimenu>
-            <guimenuitem>Save As</guimenuitem></menuchoice> 
+            <guimenuitem>Save As...</guimenuitem></menuchoice> 
             entries in the File menu to save the newly cropped photograph.
         </para>
 
diff --git a/digikam/editor-transform-resize.docbook b/digikam/editor-transform-resize.docbook
index b960692..9f5d85f 100644
--- a/digikam/editor-transform-resize.docbook
+++ b/digikam/editor-transform-resize.docbook
@@ -109,7 +109,7 @@
         </para>
 
         <para>
-            <guilabel>Save As</guilabel> and <guilabel>Load</guilabel> buttons are used to do just that. Any Blowup Photograph filter settings that you have set can be saved to the filesystem in a text file and loaded later.
+            <guilabel>Save As...</guilabel> and <guilabel>Load...</guilabel> buttons are used to do just that. Any Blowup Photograph filter settings that you have set can be saved to the filesystem in a text file and loaded later.
         </para>
 
         <warning><para>
diff --git a/digikam/editor-using.docbook b/digikam/editor-using.docbook
index 6d3f2ec..5b288fc 100644
--- a/digikam/editor-using.docbook
+++ b/digikam/editor-using.docbook
@@ -85,7 +85,7 @@
         <para>
         You might prefer to take a copy of your photograph before you make any changes. You can use
         <menuchoice><guimenu>File</guimenu>
-        <guimenuitem>Save As</guimenuitem></menuchoice>
+        <guimenuitem>Save As...</guimenuitem></menuchoice>
         to save a working copy.
         </para>
 
@@ -106,11 +106,11 @@
     <sect2> <title>Undoing/Redoing Actions</title>
 
         <para>
-        Almost anything you do to an image in Image Editor can be undone/redone. You can undo the most recent action by choosing <menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo</guimenuitem></menuchoice>, and redo by <menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice>
+        Almost anything you do to an image in Image Editor can be undone/redone. You can undo the most recent action by choosing <menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo</guimenuitem></menuchoice>, and redo by <menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice>.
         </para>
 
         <para>
-        If these are done frequently, you really should memorize the keyboard shortcuts, <guilabel>&Ctrl;-Z</guilabel> to undo an action, and <guilabel>&Ctrl;-Shift-Z</guilabel> to redo an action.
+        If these are done frequently, you really should memorize the keyboard shortcuts, <keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo> to undo an action, and <keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo> to redo an action.
         </para>
 
         <para>
@@ -122,7 +122,7 @@
     <sect2> <title>Moving Between Photographs</title>
 
         <para>
-        Once you have started the Image Editor you can move between photographs in the same view you started from by using the navigator buttons on the toolbar, <keycap>PgUp</keycap>, <keycap>PgDown</keycap> or the entries in the <guilabel>File</guilabel> menu. If you have made any changes to the current photograph you will be asked if you want to save them.
+        Once you have started the Image Editor you can move between photographs in the same view you started from by using the navigator buttons on the toolbar, &PgUp;, &PgDn; or the entries in the <guilabel>File</guilabel> menu. If you have made any changes to the current photograph you will be asked if you want to save them.
         </para>
 
     </sect2>
@@ -152,11 +152,11 @@
         <para>
         When you want to print the current image from the Image Editor, select
         <menuchoice><guimenu>File</guimenu>
-        <guimenuitem>Print image</guimenuitem></menuchoice> (<keycombo>&Ctrl;<keycap>P</keycap></keycombo>) and you get the standard Print dialog, where you can adjust the settings before printing your photograph.
+        <guimenuitem>Print image...</guimenuitem></menuchoice> (<keycombo>&Ctrl;<keycap>P</keycap></keycombo>) and you get the standard Print dialog, where you can adjust the settings before printing your photograph.
         </para>
 
         <para>
-            From the main window view you can print single images or whole sets of them. Entire thumbnail pages can be printed with your selection. All you need to do is selecting images the standard way and call <menuchoice><guimenu>Image</guimenu> <guimenuitem>Print Assistant</guimenuitem></menuchoice>. Then follow the instructions and choices to make.
+            From the main window view you can print single images or whole sets of them. Entire thumbnail pages can be printed with your selection. All you need to do is selecting images the standard way and call <menuchoice><guimenu>Item</guimenu> <guimenuitem>Print Assistant...</guimenuitem></menuchoice>. Then follow the instructions and choices to make.
         </para>
         
     </sect2>
diff --git a/digikam/menu-editor.docbook b/digikam/menu-editor.docbook
index a41d8ac..10bb3da 100644
--- a/digikam/menu-editor.docbook
+++ b/digikam/menu-editor.docbook
@@ -7,7 +7,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <shortcut><keycombo action="press"><keycap>PgUp</keycap></keycombo> </shortcut>
+                <shortcut><keycombo action="press">&PgUp;</keycombo> </shortcut>
                 <guimenu>File</guimenu><guimenuitem>Back</guimenuitem>
             </menuchoice></term>
             <listitem><para><action>Display the previous image of the current Album.</action></para></listitem>
@@ -15,7 +15,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <shortcut><keycombo action="press"><keycap>PgDown</keycap></keycombo> </shortcut>
+                <shortcut><keycombo action="press">&PgDn;</keycombo> </shortcut>
                 <guimenu>File</guimenu><guimenuitem>Forward</guimenuitem>
             </menuchoice></term>
             <listitem><para><action>Display the next image of the current Album.</action></para></listitem>
@@ -47,7 +47,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>File</guimenu><guimenuitem>Save As</guimenuitem>
+                <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
             </menuchoice></term>
             <listitem><para><action>Save the current image in a new file.</action></para></listitem>
         </varlistentry>
@@ -71,7 +71,7 @@
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo> </shortcut>
-                <guimenu>File</guimenu><guimenuitem>Print Image</guimenuitem>
+                <guimenu>File</guimenu><guimenuitem>Print Image...</guimenuitem>
             </menuchoice></term>
             <listitem><para><action>Print the current image.</action></para></listitem>
         </varlistentry>
@@ -447,14 +447,14 @@
 
     <!-- *********************************************************************** -->
  
-    <sect2>        <title>The Decoration Menu</title>
+    <sect2>        <title>The Decorate Menu</title>
 
     <para>
     <variablelist>
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Decoration</guimenu><guimenuitem>Apply Texture</guimenuitem>
+                <guimenu>Decorate</guimenu><guimenuitem>Apply Texture</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
@@ -468,7 +468,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Decoration</guimenu><guimenuitem>Add Border</guimenuitem>
+                <guimenu>Decorate</guimenu><guimenuitem>Add Border</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
@@ -479,7 +479,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <guimenu>Decoration</guimenu><guimenuitem>Insert Text</guimenuitem>
+                <guimenu>Decorate</guimenu><guimenuitem>Insert Text</guimenuitem>
             </menuchoice></term>
             <listitem>
                 <para><action>
diff --git a/digikam/menu-mainwindow.docbook b/digikam/menu-mainwindow.docbook
index 5c8e8e2..f75b2db 100644
--- a/digikam/menu-mainwindow.docbook
+++ b/digikam/menu-mainwindow.docbook
@@ -60,12 +60,12 @@
             </menuchoice></term>
             <listitem><para><action>Delete/Move to trash selected Album and all items in it.</action></para></listitem> 
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry id="synchronize-metadata">
             <term><menuchoice>
                 <guimenu>Album</guimenu>
@@ -101,12 +101,12 @@
             </menuchoice></term>
             <listitem><para><action>Opens the <link linkend="using-tagsmngr">&digikam; Tag Manager</link>.</action></para></listitem>
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Tag</guimenu><guimenuitem>New...</guimenuitem>
@@ -154,12 +154,12 @@
                    <guimenu>Item</guimenu><guimenuitem>Open With Default Application</guimenuitem></menuchoice></term>
             <listitem><para><action>Opens the selected item in the default application according to the mimetype, &eg; Gwenview.</action></para></listitem>
         </varlistentry>
-        
+<!--      
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="press"><keycap>F2</keycap></keycombo> </shortcut>
@@ -177,12 +177,12 @@
             </menuchoice></term>
             <listitem><para><action>Moves selected item(s) to trash (recoverable delete).</action></para></listitem>
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="press">&Ctrl;<keycap>L</keycap></keycombo> </shortcut>
@@ -245,12 +245,12 @@
             </menuchoice></term>
             <listitem><para><action>When editing metadata using the Metadata Editor the data will be written to the image only. If you want them to appear in the Metadata Tab of the Right Sidebar you got to use this function first.</action></para></listitem>
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Item</guimenu><guimenuitem>Rotate</guimenuitem>
@@ -351,12 +351,12 @@
                 </para>     
             </listitem>
         </varlistentry>
-        
+<!--    
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Item</guimenu><guimenuitem>Print</guimenuitem>
@@ -480,12 +480,12 @@
                 </para>
             </listitem>
         </varlistentry>
-        
+<!--     
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>View</guimenu><guisubmenu>Slideshow</guisubmenu>
@@ -541,12 +541,12 @@
             </menuchoice></term>
             <listitem><para><action>Switch to full screen (Return with the same keyboard shortcut).</action></para></listitem>
         </varlistentry>
-        
+<!--       
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul">&Ctrl;<keycap>+,+</keycap></keycombo> </shortcut>
@@ -562,12 +562,12 @@
             </menuchoice></term>
             <listitem><para><action>Decrease preview or the thumbnail size of the currently selected Album.</action></para></listitem>
         </varlistentry>
-        
+<!--
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul">&Ctrl;<keycap>,</keycap></keycombo> </shortcut>
@@ -585,12 +585,12 @@
             </menuchoice></term>
             <listitem><para><action>Will size the image as to fit snug into the window.</action></para></listitem>
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-<!--
+
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></shortcut>
@@ -647,12 +647,12 @@
             </menuchoice></term>
             <listitem><para><action>If a hierarchical tag structure exists, the currently selected branch will be displayed in full depth.</action></para></listitem>
         </varlistentry>
-        
+<!--
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul"><keycap>F12</keycap></keycombo> </shortcut>
@@ -712,12 +712,12 @@
                 </action></para>
             </listitem>            
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> </shortcut>
@@ -758,12 +758,12 @@
                 </para>     
             </listitem>
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>            
-        
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Tools</guimenu><guimenuitem>Maintenance...</guimenuitem>
@@ -777,12 +777,12 @@
                 </para>
             </listitem>            
         </varlistentry>
-        
+<!--       
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-        
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Tools</guimenu><guimenuitem>Blend Bracketed or Focus Stack Images...</guimenuitem>
@@ -871,12 +871,12 @@
             </menuchoice></term>
             <listitem><para><action>All currently mounted card readers will be listed here. The function will open the same <link linkend="using-camera-intro">interface</link> as the Import/Cameras menu item.</action></para></listitem>
         </varlistentry>
-        
+<!--    
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-
+-->
         <varlistentry>
             <term><menuchoice>
                 <shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>I</keycap></keycombo> </shortcut>
@@ -912,12 +912,12 @@
                 </para>     
             </listitem>
         </varlistentry>
-        
+<!--       
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-        
+-->
         <varlistentry>        
             <term><menuchoice>
                 <guimenu>Import</guimenu><guimenuitem>Import from ...</guimenuitem>
@@ -1115,12 +1115,12 @@
                 </para>
             </listitem>
         </varlistentry>
-        
+<!--        
         <varlistentry>
             <term>______________________________</term>
             <listitem><para></para></listitem>
         </varlistentry>
-        
+-->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Settings</guimenu><guimenuitem>Themes</guimenuitem>
diff --git a/digikam/tool-maintenance.docbook b/digikam/tool-maintenance.docbook
index ff309eb..ac3eabc 100644
--- a/digikam/tool-maintenance.docbook
+++ b/digikam/tool-maintenance.docbook
@@ -18,7 +18,7 @@
         <title>Introduction</title>
 
         <para>
-            Depending on your workflow, your &digikam; settings and whether you work on your images collection also with other programs it might be necessary to run maintenance operations from time to time to update the &digikam; databases and also your images regarding duplicates, face tags, quality labels etc. The maintenance tool can do that for you, even more than one operation in one go depending on your requirements.
+            Depending on your workflow, your &digikam; settings and whether you work on your images collection also with other programs it might be necessary to run maintenance operations from time to time to update the &digikam; databases and also your images regarding duplicates, face tags, quality labels, &etc; The maintenance tool can do that for you, even more than one operation in one go depending on your requirements.
         </para>
 
     </sect1>
diff --git a/digikam/tool-metadataeditor.docbook b/digikam/tool-metadataeditor.docbook
index 588fa56..1712cba 100644
--- a/digikam/tool-metadataeditor.docbook
+++ b/digikam/tool-metadataeditor.docbook
@@ -49,7 +49,7 @@ The Metadata Editor is a tool for adding and editing EXIF, IPTC, or XMP metadata
     Remember that EXIF is dedicated to store camera information, 
     where IPTC and XMP are more used to store post-process text information such as rights management.  
     So, it is not recommended to edit the metadata injected by the camera that took the photograph; 
-    on the other hand, you can add information about the author, copyright etc.
+    on the other hand, you can add information about the author, copyright, &etc;
     <ulink url="http://www.exiv2.org/metadata.html" >Detailed description of supported entries</ulink > is available online.
 </para>
 
diff --git a/digikam/using-dam-build.docbook b/digikam/using-dam-build.docbook
index acd919e..bc26cfd 100644
--- a/digikam/using-dam-build.docbook
+++ b/digikam/using-dam-build.docbook
@@ -208,7 +208,7 @@
         </para>
 
         <para>
-            e.g. conversion of a Garmin track with file name 'xyz':
+            &eg; conversion of a Garmin track with file name 'xyz':
         </para>
 
         <blockquote>
diff --git a/digikam/using-mainwindow-albumsview.docbook b/digikam/using-mainwindow-albumsview.docbook
index 8380c98..0e83873 100644
--- a/digikam/using-mainwindow-albumsview.docbook
+++ b/digikam/using-mainwindow-albumsview.docbook
@@ -19,7 +19,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> (<keycombo>&Ctrl;<keycap>N</keycap></keycombo>) 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> (<keycombo>&Ctrl;<keycap>N</keycap></keycombo>) 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 &dolphin; 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>
diff --git a/digikam/using-mainwindow-fuzzysearches.docbook b/digikam/using-mainwindow-fuzzysearches.docbook
index 17bfc3b..129f179 100644
--- a/digikam/using-mainwindow-fuzzysearches.docbook
+++ b/digikam/using-mainwindow-fuzzysearches.docbook
@@ -9,7 +9,7 @@
 
         <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 range you can narrow down or enlarge the search result. Note that by lowering the upper threshold a little bit below 100 % you can keep things like exact copies, images from series shots etc. out of the search result if you want.
+                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 range you can narrow down or enlarge the search result. Note that by lowering the upper threshold a little bit below 100 % you can keep things like exact copies, images from series shots, &etc; out of the search result if you want.
             </para>
 
             <example>
diff --git a/digikam/using-mainwindow-imageview.docbook b/digikam/using-mainwindow-imageview.docbook
index 4e7c16e..2190ce0 100644
--- a/digikam/using-mainwindow-imageview.docbook
+++ b/digikam/using-mainwindow-imageview.docbook
@@ -58,9 +58,9 @@
             There are several possibilities to view an image. You can either click on it, select 
             <menuchoice>
                 <shortcut><keycombo action="press"><keycap>F3</keycap></keycombo></shortcut>
-                <guimenu>Image</guimenu><guisubmenu>View</guisubmenu><guimenuitem>Preview Image</guimenuitem>
+                <menuchoice><guimenu>View</guimenu><guimenuitem>Preview Image</guimenuitem></menuchoice>
             </menuchoice> 
-            from the menu bar or select <guilabel>View</guilabel> from the context menu. The Preview Area will open and the Icon Area will be reduced to one line. For viewing it larger, click the sidebars away (by just clicking on the active button on them). An even larger view you can achieve by clicking the <quote>Show Fullscreen</quote> icon 
+            from the menu bar or select <guilabel>Preview Image</guilabel> from the context menu. The Preview Area will open and the Icon Area will be reduced to one line. For viewing it larger, click the sidebars away (by just clicking on the active button on them). An even larger view you can achieve by clicking the <quote>Show Fullscreen</quote> icon 
             <inlinemediaobject>
                 <imageobject><imagedata fileref="&path;using-mainwindow-icon-fullscreen.png" format="PNG"/> </imageobject>
             </inlinemediaobject> 
@@ -163,7 +163,7 @@
         <para>
             When you delete a photograph from &digikam; with
             <menuchoice>
-                <shortcut><keycombo action="simul"><keycap>Del</keycap></keycombo></shortcut>
+                <shortcut><keycombo action="simul">&Del;</keycombo></shortcut>
             <guimenu>Item</guimenu><guimenuitem>Move to Trash</guimenuitem>
             </menuchoice>  
             it will be moved from its folder on the hard disk to the internal Trash Can.
diff --git a/digikam/using-setup-views.docbook b/digikam/using-setup-views.docbook
index a83dd26..255edb1 100644
--- a/digikam/using-setup-views.docbook
+++ b/digikam/using-setup-views.docbook
@@ -113,7 +113,7 @@
         </para>
 
         <para>
-            The option <guilabel>Show icons and text over preview</guilabel> will show icons for rotation, face tags, full screen mode etc. in the top left corner of the image preview and a text indicating which data the preview is showing in the top right corner.
+            The option <guilabel>Show icons and text over preview</guilabel> will show icons for rotation, face tags, full screen mode, &etc; in the top left corner of the image preview and a text indicating which data the preview is showing in the top right corner.
         </para>
 
         <para>
