Git commit fd61f7bbd2d9a375e6a5e1efddc08335d26b85b7 by Gilles Caulier.
Committed on 21/08/2016 at 18:15.
Pushed by cgilles into branch 'master'.

remove redondant author sections and cleanup

M  +30   -62   digikam/credits-annex.docbook
M  +0    -82   digikam/editor-color.docbook
M  +3    -45   digikam/editor-decorate.docbook
M  +0    -147  digikam/editor-enhance.docbook
M  +1    -82   digikam/editor-filters.docbook
M  +0    -48   digikam/editor-transform.docbook
M  +1    -1    digikam/file-formats.docbook
M  +1    -1    digikam/ie-menu.docbook
M  +12   -47   digikam/index.docbook
M  +1    -1    digikam/menu-descriptions.docbook

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

diff --git a/digikam/credits-annex.docbook b/digikam/credits-annex.docbook
index 53f0591..9f99df9 100644
--- a/digikam/credits-annex.docbook
+++ b/digikam/credits-annex.docbook
@@ -1,104 +1,72 @@
 <chapter id="credits">              <title>Credits and License</title>
 
 <para>
-    
+
     <inlinemediaobject>
         <imageobject><imagedata fileref="&path;digikamlogo.png" 
format="PNG"/></imageobject>
         <textobject> <phrase>&digikam; logo</phrase> </textobject>
     </inlinemediaobject>
-    
+
+</para>
+
+<para>
+Program copyright 2001-2016, &digikam; developers team
 </para>
 
 <para>
-Program copyright 2001-2006, &digikam; developers team
+Documentation copyrighted by:
 
     <itemizedlist>
 
         <listitem>
             <para>
-            Renchi Raju <email>renchi_at_pooh.tam.uiuc.edu</email>: 
-            Coordinator, Main Developer.
-            </para>
-        </listitem>
-    
-        <listitem>
-            <para>
-            Caulier Gilles <email>caulier_dot_gilles_at_gmail_dot_com</email>: 
-            Co-coordinator, Developer, French Translations.
+            2001-2016
+            Gilles Caulier <email>caulier_dot_gilles_at_gmail_dot_com</email>
             </para>
         </listitem>
-    
-        <listitem>
-            <para>
-            Joern Ahrens <email>kde_at_jokele.de</email>: 
-            Developer.
-            </para>
-        </listitem>
-    
+
         <listitem>
             <para>
-            Tom Albers <email>tomalbers_at_kde.nl</email>: 
-            Developer.
+            2001-2005
+            Renchi Raju <email>renchi_dot_raju_at_gmail_dot_com</email>
             </para>
         </listitem>
-                
+
         <listitem>
             <para>
-            Ralf Hoelzer <email>kde_at_ralfhoelzer.com</email>: 
-            Developer.
+            2003-2005
+            <itemizedlist>
+                <listitem><para>Richard Taylor 
<email>r_dot_taylor_at_bcs_dot_org_dot_uk</email></para></listitem>
+                <listitem><para>Ralf Hoelzer 
<email>kde_at_ralfhoelzer_dot_com</email></para></listitem>
+                <listitem><para>Joern Ahrens 
<email>kde_at_jokele_dot_de</email></para></listitem>
+                <listitem><para>Oliver Doerr 
<email>oliver_at_doerr-privat.de</email></para></listitem>
+            </itemizedlist>
             </para>
         </listitem>
 
-    </itemizedlist>
-
-</para>
-
-<para>
-Documentation copyrighted by:
-
-    <itemizedlist>
-        
         <listitem>
             <para>
-            2001-2002 
-            Renchi Raju <email>renchi_at_pooh.tam.uiuc.edu</email>.
+                2006
+                Elle Stone <email>jrle1_at_twcny_dot_rr_dot_com</email>
             </para>
         </listitem>
-        
+
         <listitem>
             <para>
-            2002-2003 
-            <itemizedlist>
-                <listitem><para>Gilles Caulier 
<email>caulier_dot_gilles_at_gmail_dot_com</email></para></listitem>
-                <listitem><para>Renchi Raju 
<email>renchi_at_pooh.tam.uiuc.edu</email></para></listitem>
-            </itemizedlist>
+                2003-2010
+                Gerhard Kulzer <email>gerhard_at_kulzer_dot_net</email>
             </para>
         </listitem>
-    
+
         <listitem>
             <para>
-            2003-2005 
-            <itemizedlist>
-                <listitem><para>Gilles Caulier 
<email>caulier_dot_gilles_at_gmail_dot_com</email></para></listitem>
-                <listitem><para>Renchi Raju 
<email>renchi_at_pooh.tam.uiuc.edu</email></para></listitem>
-                <listitem><para>Richard Taylor 
-                
<email>rjt-digicam_at_thegrindstone_dot_me_dot_uk</email></para></listitem>
-                <listitem><para>Ralf Hoelzer 
<email>kde_at_ralfhoelzer.com</email></para></listitem>
-                <listitem><para>Joern Ahrens 
<email>kde_at_jokele.de</email></para></listitem>
-                <listitem><para>Oliver Doerr 
<email>oliver_at_doerr-privat.de</email></para></listitem>
-                <listitem><para>Gerhard Kulzer <email>gerhard at 
kulzer.net</email></para></listitem>
-            </itemizedlist>
-            2005-2007
-            <itemizedlist>
-                <listitem><para>Gilles Caulier 
<email>caulier_dot_gilles_at_gmail_dot_com</email></para></listitem>
-                <listitem><para>Gerhard Kulzer <email>gerhard at 
kulzer.net</email></para></listitem>
-            </itemizedlist>
+                2016
+                Wolfgang Scheffner <email>wscheffner3_at_gmail_dot_com</email>
             </para>
         </listitem>
-        
+
     </itemizedlist>
-    
-All Images copyrighted 2003-2007 by Gilles Caulier 
<email>caulier_dot_gilles_at_gmail_dot_com</email> and Gerhard Kulzer 
<email>gerhard_at_kulzer_dot_net</email>.
+
 </para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/digikam/editor-color.docbook b/digikam/editor-color.docbook
index 6227a9f..f2b8748 100644
--- a/digikam/editor-color.docbook
+++ b/digikam/editor-color.docbook
@@ -3,24 +3,12 @@
 <sect3 id="auto-correction">
 <sect3info>           <title>Auto-Correction Tools</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
     <para>
        This tool set provides five automatic correction levels that will 
improve an image in most cases. Use this tool before going into the more 
involved manual adjustments.
     </para>
  </abstract>
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -76,17 +64,6 @@
 
 <title>White Balance</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>White Balance</emphasis> is a semi-automatic tool to 
adjust the white-balance of a photograph.
@@ -94,7 +71,6 @@ The &digikam; <emphasis>White Balance</emphasis> is a 
semi-automatic tool to adj
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -366,13 +342,6 @@ Low <guilabel>Color Temperature</guilabel> implies more 
yellow-red light while h
 <sect3info>
 <title>Solarize Image</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Color Effects</emphasis>tool provides four color 
effects: a solarization effect, a velvia filter, neon effect and edge filter.
@@ -380,7 +349,6 @@ The &digikam; <emphasis>Color Effects</emphasis>tool 
provides four color effects
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 <keyword>Solarization</keyword>
 <keyword>Velvia</keyword>
@@ -486,17 +454,6 @@ The <guilabel>Intensity</guilabel> level applied is 30%.
 
 <title>Adjust Levels</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Adjust Levels</emphasis> is a tool to manually adjust 
the histogram channels of an image.
@@ -504,7 +461,6 @@ The &digikam; <emphasis>Adjust Levels</emphasis> is a tool 
to manually adjust th
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -639,18 +595,6 @@ Below, you can see an <guilabel>Input levels</guilabel> 
adjustment example appli
 
 <title>Adjust Curves</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
   <para>
     The &digikam; <emphasis>Adjust Curves</emphasis> is a tool to non-linearly 
adjust luminosity graduation and color channels.
@@ -658,7 +602,6 @@ Below, you can see an <guilabel>Input levels</guilabel> 
adjustment example appli
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -774,18 +717,6 @@ Below you can see a black and white photograph corrected 
in <guilabel>Luminosity
 
 <title>Channel Mixer</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; image <emphasis>Channel Mixer</emphasis> is a tool to remix the 
color channels to improve or modify the photograph color shades.
@@ -793,7 +724,6 @@ The &digikam; image <emphasis>Channel Mixer</emphasis> is a 
tool to remix the co
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -861,24 +791,12 @@ Below, you can see a photograph color tone adjustments 
for the <guilabel>Blue</g
 <sect3 id="blackandwhite-conversion">
 <sect3info>           <title>Black and White Conversion Filters</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
     <para>
        Black &amp; White photography has always been fascinating in its 
abstraction capability. With the advent of digital photography, B&amp;W has 
almost become a desktop activity, as color images can be easily converted on 
the computer into black and white, even providing a set of vintage film roll 
profiles.
     </para>
  </abstract>
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
diff --git a/digikam/editor-decorate.docbook b/digikam/editor-decorate.docbook
index 0fca2de..31f2863 100644
--- a/digikam/editor-decorate.docbook
+++ b/digikam/editor-decorate.docbook
@@ -4,13 +4,6 @@
 
 <title>Apply Texture</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Apply Texture</emphasis> is a tool for applying 
decorative textures to an image.
@@ -18,7 +11,6 @@ The &digikam; <emphasis>Apply Texture</emphasis> is a tool 
for applying decorati
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -74,13 +66,6 @@ A <guilabel>Paper</guilabel> texture effect apply to a 
photograph is available b
 
 <title>Add Border</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Add Border</emphasis> is a tool to frame an image with 
decorative borders.
@@ -88,7 +73,6 @@ The &digikam; <emphasis>Add Border</emphasis> is a tool to 
frame an image with d
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -131,7 +115,7 @@ Click on the <guilabel>OK</guilabel> button to apply the 
border around the curre
 <note><para>
   The border decorated target image will be bigger than the original, but it 
will retain the same aspect ratio. This is important for printing images, 
especially if you have used the Aspect Ratio Crop tool before.
 </para></note>
-           
+
 </sect4>
 
 <sect4 id="inaction-border">
@@ -155,18 +139,6 @@ The Add Border dialog tool in action is available below.
 
 <title>Insert Text</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Insert Text</emphasis> is a tool for adding text to an 
image.
@@ -174,7 +146,6 @@ The &digikam; <emphasis>Insert Text</emphasis> is a tool 
for adding text to an i
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -221,18 +192,6 @@ The Insert Text dialog tool in action is shown below.
 
 <title>Template Superimpose</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>    
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Template Superimpose</emphasis> is a masking tool to 
superimpose templates to an image.
@@ -240,7 +199,6 @@ The &digikam; <emphasis>Template Superimpose</emphasis> is 
a masking tool to sup
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -269,7 +227,7 @@ New templates can be created using any paint program, and 
the template must be s
 <para>
 There is no restriction on template size and orientation, but you must use PNG 
file format with max. compression (9) to reduce the template file size. If you 
want to add your template creation to the &digikam; templates database, please 
send a mail to this &digikam; mailing-list <email>[email protected]</email>.
 </para>
-            
+
 </sect4>
 
 <sect4 id="using-superimpose">
@@ -328,4 +286,4 @@ mode: sgml
 sgml-omittag: nil
 sgml-shorttag: t
 End:
--->
\ No newline at end of file
+-->
diff --git a/digikam/editor-enhance.docbook b/digikam/editor-enhance.docbook
index cd70df7..2523d35 100644
--- a/digikam/editor-enhance.docbook
+++ b/digikam/editor-enhance.docbook
@@ -9,26 +9,6 @@ End:
   <sect3 id="sharpening" >
     <sect3info>
       <title>Image Sharpening</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Gerhard</firstname>
-          <surname>Kulzer</surname>
-          <affiliation>
-            <address>
-              <email>gerhard at kulzer dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
 &digikam; provides three different tools for sharpening, with each having 
<link linkend="comparison-refocus" >merits</link> in a different area.
@@ -52,7 +32,6 @@ End:
         </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>Digikam</keyword>
         <keyword>Refocus</keyword>
         <keyword>Unsharp mask</keyword>
@@ -409,26 +388,6 @@ End:
   <sect3 id="inpainting" >
     <sect3info>
       <title>Photograph Inpainting</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Gerhard</firstname>
-          <surname>Kulzer</surname>
-          <affiliation>
-            <address>
-              <email>gerhard at kulzer dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
           <ulink url="http://cimg.sourceforge.net"; >
@@ -447,7 +406,6 @@ End:
 </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>Digikam</keyword>
       </keywordset>
     </sect3info>
@@ -579,26 +537,6 @@ Below, you can see a <guilabel>Remove Small 
Area</guilabel> Inpainting type appl
   <sect3 id="noisereduction" >
     <sect3info>
       <title>Noise Reduction</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Gerhard</firstname>
-          <surname>Kulzer</surname>
-          <affiliation>
-            <address>
-              <email>gerhard at kulzer dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
 &digikam;
@@ -607,7 +545,6 @@ It uses an algorithm copyrighted by Peter Heckert.
 </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>Digikam</keyword>
         <keyword>Noise reduction</keyword>
         <keyword>Blur</keyword>
@@ -746,26 +683,6 @@ You can see below a full description of all parameters. In 
most cases only <guil
   <sect3 id="restoration" >
     <sect3info>
       <title>Photograph Restoration</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Gerhard</firstname>
-          <surname>Kulzer</surname>
-          <affiliation>
-            <address>
-              <email>gerhard at kulzer dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
           <ulink url="http://cimg.sourceforge.net"; >
@@ -785,7 +702,6 @@ The  <emphasis>Photograph Restoration</emphasis> is 
definitely one of the most a
 </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>Digikam</keyword>
       </keywordset>
     </sect3info>
@@ -932,26 +848,6 @@ Below, you can see an another Photograph Restoration 
example using <guilabel>Red
   <sect3 id="hotpixels" >
     <sect3info>
       <title>Hot Pixels Correction</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Unai</firstname>
-          <surname>Garro</surname>
-          <affiliation>
-            <address>
-              <email>ugarro at telefonica dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
 &digikam;
@@ -959,7 +855,6 @@ The  <emphasis>Hot Pixels</emphasis> tool facilitates 
removing hot pixels from p
 </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>digiKam</keyword>
       </keywordset>
     </sect3info>
@@ -1059,26 +954,6 @@ Below, you can see the Hot Pixels Correction tool applied 
to a color photograph
   <sect3 id="vignettingcorrection" >
     <sect3info>
       <title>Vignetting Correction</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Gerhard</firstname>
-          <surname>Kulzer</surname>
-          <affiliation>
-            <address>
-              <email>gerhard at kulzer dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
 &digikam;
@@ -1086,7 +961,6 @@ The  <emphasis>Vignetting correction</emphasis> is a tool 
to correct image vigne
 </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>Digikam</keyword>
         <keyword>Anti-Vignetting</keyword>
        <keyword>Add vignetting</keyword>
@@ -1195,26 +1069,6 @@ The values used for this example are:
   <sect3 id="lensdistortion" >
     <sect3info>
       <title>Lens Distortion Correction</title>
-      <authorgroup>
-        <author>
-          <firstname>Gilles</firstname>
-          <surname>Caulier</surname>
-          <affiliation>
-            <address>
-              <email>caulier_dot_gilles_at_gmail_dot_com</email>
-            </address>
-          </affiliation>
-        </author>
-        <author>
-          <firstname>Gerhard</firstname>
-          <surname>Kulzer</surname>
-          <affiliation>
-            <address>
-              <email>gerhard at kulzer dot net</email>
-            </address>
-          </affiliation>
-        </author>
-      </authorgroup>
       <abstract>
         <para>
 &digikam;
@@ -1222,7 +1076,6 @@ The  <emphasis>Lens Distortion</emphasis> is a tool to 
correct spherical lens ab
 </para>
       </abstract>
       <keywordset>
-        <keyword>KDE</keyword>
         <keyword>Digikam</keyword>
       </keywordset>
     </sect3info>
diff --git a/digikam/editor-filters.docbook b/digikam/editor-filters.docbook
index 3d45b59..839e834 100644
--- a/digikam/editor-filters.docbook
+++ b/digikam/editor-filters.docbook
@@ -4,18 +4,6 @@
 
 <title>Simulate Infrared Film</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>  
-    
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Infrared Film</emphasis> filter simulates traditional 
infrared film material.
@@ -23,7 +11,6 @@ The &digikam; <emphasis>Infrared Film</emphasis> filter 
simulates traditional in
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -80,13 +67,6 @@ This is an example of the infrared film effect applied to a 
color image taken in
 
 <title>Film Grain</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Filmgrain</emphasis> filter reproduces traditional 
film grain techniques 
@@ -95,7 +75,6 @@ of high speed films.
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -149,13 +128,6 @@ graininess is ISO-1600.
 
 <title>Oil Paint</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Oil Paint</emphasis> filter gives your image the look 
of an oilpainting. 
@@ -164,7 +136,6 @@ It uses an algorithm copyrighted by Pieter Voloshyn.
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -211,13 +182,6 @@ image is (2). <guilabel>Brush Size</guilabel> for this 640 
pixel size image is 1
 
 <title>Charcoal Drawing</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Charcoal</emphasis> is an effect filter that creates a 
charcoal sketch-like result.
@@ -225,7 +189,6 @@ The &digikam; <emphasis>Charcoal</emphasis> is an effect 
filter that creates a c
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -272,13 +235,6 @@ Default values of 30 and 10 where applied. The result can 
be improved by adjusti
 
 <title>Emboss Image</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Emboss</emphasis> filter sculptures your image into 
3-D as if it were stamped into wax. It uses an algorithm copyrighted by Pieter 
Voloshyn.
@@ -286,7 +242,6 @@ The &digikam; <emphasis>Emboss</emphasis> filter sculptures 
your image into 3-D
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -329,20 +284,6 @@ The <guilabel>Depth</guilabel> applied is 10%.
 
 <title>Distortion FX</title>
 
-<authorgroup>
-    
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-    
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Distortion FX</emphasis> is a series of distorting 
effects for digital still images.
@@ -350,7 +291,6 @@ The &digikam; <emphasis>Distortion FX</emphasis> is a 
series of distorting effec
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -574,18 +514,6 @@ The Distortion FX dialog tool in action is available below.
 
 <title>Blur FX</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>  
-
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Blur FX</emphasis> is a series of blurring effects for 
digital still images.
@@ -593,7 +521,6 @@ The &digikam; <emphasis>Blur FX</emphasis> is a series of 
blurring effects for d
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -758,13 +685,6 @@ An example of the Blur FX dialog in action is shown below.
 
 <title>Rain Drops</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Raindrops</emphasis> filter puts beautiful raindrops 
on your image.
@@ -772,7 +692,6 @@ The &digikam; <emphasis>Raindrops</emphasis> filter puts 
beautiful raindrops on
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -832,4 +751,4 @@ mode: sgml
 sgml-omittag: nil
 sgml-shorttag: t
 End:
--->
\ No newline at end of file
+-->
diff --git a/digikam/editor-transform.docbook b/digikam/editor-transform.docbook
index 50e1d67..273b7db 100644
--- a/digikam/editor-transform.docbook
+++ b/digikam/editor-transform.docbook
@@ -21,20 +21,6 @@
 
 <title>Change the image size</title>
 
-<authorgroup>
-    
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>
-    
-</authorgroup>
-
 <abstract>
 
 <para>
@@ -50,7 +36,6 @@ The &digikam; <emphasis>Blowup Photograph</emphasis> is 
definitely one of the mo
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 <keyword>Cimg</keyword>
 <keyword>Greycstoration</keyword>
@@ -438,17 +423,6 @@ You can see below an Blowup Photograph example applied to 
a small color image ar
 
 <title>Free Rotation</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>        
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Free Rotation</emphasis> is a tool for image rotation 
by any arbitrary angle.
@@ -456,7 +430,6 @@ The &digikam; <emphasis>Free Rotation</emphasis> is a tool 
for image rotation by
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -529,18 +502,6 @@ One way to fix them is to crop the image with 
<menuchoice><guimenu>Transform</gu
 
 <title>Perspective Adjustment</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-    
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        <affiliation><address><email>gerhard at kulzer dot 
net</email></address></affiliation>
-    </author>    
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Perspective Adjustment</emphasis> is a tool for 
adjusting the image's perspective.
@@ -548,7 +509,6 @@ The &digikam; <emphasis>Perspective Adjustment</emphasis> 
is a tool for adjustin
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
@@ -614,13 +574,6 @@ The Perspective Adjustment dialog in action is shown below.
 
 <title>Shearing Image</title>
 
-<authorgroup>
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-</authorgroup>
-
 <abstract>
 <para>
 The &digikam; <emphasis>Shearing Image</emphasis> is a tool for shearing an 
image horizontally 
@@ -629,7 +582,6 @@ or vertically.
 </abstract>
 
 <keywordset>
-<keyword>KDE</keyword>
 <keyword>Digikam</keyword>
 </keywordset>
 
diff --git a/digikam/file-formats.docbook b/digikam/file-formats.docbook
index bee17ad..f76182a 100644
--- a/digikam/file-formats.docbook
+++ b/digikam/file-formats.docbook
@@ -234,7 +234,7 @@
         <sect2>        <title>Moving Image Formats (Videos)</title>
 
         <para>
-        Many digital cameras support taking of short movie clips. These clips 
are usually stored in AVI or MPEG format. &digikam; understands these formats 
and will generate thumbnails for the movie files. However, &digikam; is not a 
movie editing application and it does not have any built-in movie viewing or 
editing capabilities. If you double click on a movie file &digikam; will use 
your &kde; settings to choose a viewing application to use.
+        Many digital cameras support taking of short movie clips. These clips 
are usually stored in AVI or MPEG format. &digikam; understands these formats 
and will generate thumbnails for the movie files. However, &digikam; is not a 
movie editing application and it does not have any built-in movie viewing or 
editing capabilities. If you double click on a movie file &digikam; will use 
your desktop settings to choose a viewing application to use.
         </para>
         </sect2>
 
diff --git a/digikam/ie-menu.docbook b/digikam/ie-menu.docbook
index f0aee1f..0d203b2 100644
--- a/digikam/ie-menu.docbook
+++ b/digikam/ie-menu.docbook
@@ -721,7 +721,7 @@
             <term><menuchoice>
                 <guimenu>Help</guimenu><guimenuitem>ImagePlugins' 
Handbooks</guimenuitem>
             </menuchoice></term>
-            <listitem><para>Launch the &kde; help interface with the &digikam; 
Image Editor 
+            <listitem><para>Launch the help interface with the &digikam; Image 
Editor 
             plugins handbooks.</para></listitem>
         </varlistentry>
     
diff --git a/digikam/index.docbook b/digikam/index.docbook
index 6898376..1995f73 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -32,41 +32,6 @@
 
 <title>The &digikam; Handbook</title>
 
-<authorgroup>
-
-    <author>
-        <firstname>Gerhard</firstname><surname>Kulzer</surname>
-        
<affiliation><address><email>gerhard_at_kulzer_dot_net</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Gilles</firstname><surname>Caulier</surname>
-        
<affiliation><address><email>caulier_dot_gilles_at_gmail_dot_com</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Elle</firstname><surname>Stone</surname>
-        
<affiliation><address><email>jrle1_at_twcny_dot_rr_dot_com</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Oliver</firstname><surname>Doerr</surname>
-        
<affiliation><address><email>oliver_at_doerr-privat.de</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Ralf</firstname><surname>Hoelzer</surname>
-        
<affiliation><address><email>kde_at_ralfhoelzer.com</email></address></affiliation>
-    </author>
-
-    <author>
-        <firstname>Joern</firstname><surname>Ahrens</surname>
-        
<affiliation><address><email>joern.ahrens_at_kdemail_dot_net</email></address></affiliation>
-    </author>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
 <copyright>
     <year>2001</year>
     <year>2016</year>
@@ -734,7 +699,7 @@
             <title>Viewing or Editing a Photograph With Another 
Application</title>
 
                 <para>
-                Sometimes &digikam; may not provide all of the capabilities 
you need. You can open a photograph in another application by right-clicking on 
it and selecting from the <guilabel>Open With</guilabel> sub-menu. The list of 
applications that appear in this menu is controlled by the standard desktop 
file associations for the image format type of this photograph. Consult the 
&kde; manual for instructions on changing these file associations if the 
application that you need is not listed.
+                Sometimes &digikam; may not provide all of the capabilities 
you need. You can open a photograph in another application by right-clicking on 
it and selecting from the <guilabel>Open With</guilabel> sub-menu. The list of 
applications that appear in this menu is controlled by the standard desktop 
file associations for the image format type of this photograph. Consult the 
desktop manual for instructions on changing these file associations if the 
application that you need is not listed.
                 </para>
 
                 <para>
@@ -785,7 +750,7 @@
             <title>Deleting a Photograph</title>
 
                 <para>
-                When you delete a photograph from &digikam; it will be moved 
to the &kde; Trash Can.
+                When you delete a photograph from &digikam; it will be moved 
to the internal Trash Can.
                    <menuchoice>
                      <shortcut><keycombo 
action="simul"><keycap>F8</keycap></keycombo> </shortcut>
                     <guimenu>Image</guimenu><guimenuitem>Delete</guimenuitem>
@@ -1103,7 +1068,7 @@
       <para>But as much as there is no such thing as a free lunch, there is no 
free cataloging or DAM - those who spend the initial time of building a 
systematic method of their own will be better off as time passes and the number 
of photographs multiplies. The ROI (return on investment) of DAM has been 
estimated in different studies to be better than 10. Keep in mind to be 
<command>concise, plan for the future (30-50y), do it once</command>. The 
upcoming semantic web will totally integrate into and add value to a DAM 
environment.</para>
 
       <sect3 id="case-for-digikam">  <title>A case for doing DAM with 
&digikam;</title>
-      <para>&digikam; provides a number of methods to classify photographs: 
filenames, albums, collections, date + time, tags, rating, GPS position and 
captions. As if this was not enough, in the KDE4 version of &digikam; you can 
search many standard metadata items like camera model, lens, coordinates, image 
size and many more. Metadata categories as listed here are in fact different 
'views' of your photo library. Combining these views is<emphasis> the 
</emphasis>very powerful method to narrow down the search for a file and to 
find it quickly. Imagine having 800 photos of your loved one. Searching for 
'Mary', having more than '***' rating, shot in 'France' will surely leave you 
with very few candidates. In terms of selection criteria for a DAM system, 
&digikam; fares very well in terms of completeness, versatility, speed, 
scalability, accuracy and openness.</para>
+      <para>&digikam; provides a number of methods to classify photographs: 
filenames, albums, collections, date + time, tags, rating, GPS position and 
captions. As if this was not enough, you can search many standard metadata 
items like camera model, lens, coordinates, image size and many more. Metadata 
categories as listed here are in fact different 'views' of your photo library. 
Combining these views is<emphasis> the </emphasis>very powerful method to 
narrow down the search for a file and to find it quickly. Imagine having 800 
photos of your loved one. Searching for 'Mary', having more than '***' rating, 
shot in 'France' will surely leave you with very few candidates. In terms of 
selection criteria for a DAM system, &digikam; fares very well in terms of 
completeness, versatility, speed, scalability, accuracy and openness.</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.</para>
       <para>One distinction has to be interjected here between 
<command>private</command> and <command>public metadata</command>. One could 
say that all file-embedded attributes are potentially public since the images 
may be exported, sold, and copied to other places and people. On the other hand 
all non-embedded metadata in the database can be considered private as they 
stay in the database and go nowhere else. By adjusting &digikam;'s settings 
accordingly you can control what kind of data remains private and what will be 
embedded and eventually become public.</para>
     </sect3>
@@ -1193,12 +1158,12 @@ Fun stuff
         <listitem><para>contemplate, research, watch, and talk - but mostly 
listen.</para></listitem>
         <listitem><para> it's okay if the image is less than perfect because 
it has the strength to stand on its own merit described in the 
caption.</para></listitem>
 </itemizedlist>
-      <para>With &digikam; you can enter unlimited amounts of text using 
internationalized alphabet (UTF-8) as caption. You can enter it for a selection 
of photos at the same time. KDE even provides a spell checker. When you export 
images to web galleries, the captions will be exported at choice into 
either/or/and caption/title of the web gallery system, no need to re-write the 
story for publishing.</para>
+      <para>With &digikam; you can enter unlimited amounts of text using 
internationalized alphabet (UTF-8) as caption. You can enter it for a selection 
of photos at the same time. When you export images to web services, the 
captions will be exported at choice into either/or/and caption/title of the web 
gallery system, no need to re-write the story for publishing.</para>
     </sect3>
 
       <sect3 id="geotagging">  <title>Geolocation (geo-tagging)</title>
       <para>Do you still remember the times before GPS? When you would find 
your way to another city without navigation system? Wasn't the earth a dull 
blue ball before GoogleEarth? Well then, with images, the train of spatial 
representation is running at cruising speed alright. </para>
-      <para>A few cameras have a GPS receiver built-in, the images come tagged 
with 3-dimensional coordinates. And with almost any GPS device you're able to 
extract a trace (of course the receiver needs to be switched-on and carried 
with you whilst taking the photographs, and for good matching the camera time 
must be accurately set) and save it onto a computer. You have to store it in 
gpx format, that's easily done with gpsbabel, gpsman and other tools. You then 
can automatically match a whole bunch of photos with that track using 
&digikam;. The coordinates are written into the JFIF part of JPG files 
(settings choice) and into the database. The KDE4 version will enable searches 
based on locations and coordinates, you can create virtual albums of 
geographical areas! In the right sidebar under the metadata tab you'll find 
your image located on a local zoom of the world map. A further click brings on 
anyone of several mapping services on the web, zooming in on details. Even if 
you don't have a GPS trace you can geo-tag multiple images with a geo-editor. 
Just navigate on the map to the spot of shooting and click to fix it as a 
geo-tag. </para>
+      <para>A few cameras have a GPS receiver built-in, the images come tagged 
with 3-dimensional coordinates. And with almost any GPS device you're able to 
extract a trace (of course the receiver needs to be switched-on and carried 
with you whilst taking the photographs, and for good matching the camera time 
must be accurately set) and save it onto a computer. You have to store it in 
gpx format, that's easily done with gpsbabel, gpsman and other tools. You then 
can automatically match a whole bunch of photos with that track using 
&digikam;. The coordinates are written into the JFIF part of JPG files 
(settings choice) and into the database. &digikam; will enable searches based 
on locations and coordinates, you can create virtual albums of geographical 
areas! In the right sidebar under the metadata tab you'll find your image 
located on a local zoom of the world map. A further click brings on anyone of 
several mapping services on the web, zooming in on details. Even if you don't 
have a GPS trace you can geo-tag multiple images with a geo-editor. Just 
navigate on the map to the spot of shooting and click to fix it as a geo-tag. 
</para>
       <para>e.g. conversion of a Garmin track with file name 'xyz':</para>
 <blockquote><screen>&dollar; gpsbabel -w -i mapsource -f xyz.mps -o gpx -F 
xyz.gpx</screen></blockquote>
       <para>The possibilities of exploiting this geolocation are already 
innumerable and will become pervasive in the future. I'm sure one day not too 
far away we can revisit in a virtual reality our travels through geo-tagged 
pictures. The &digikam; features include exporting to kml files that can be 
opened by GoogleEarth (which in turn will show the photos on their shooting 
site), exporting to gallery2, picasaweb, flickr &etc; with GoogleMaps viewer 
and more.</para>
@@ -1580,7 +1545,7 @@ Fun stuff
             </para>
 
             <para>
-            If you do not want to download all of the photographs you can 
select just those that you need using the standard &kde; selection methods. 
Once you have the photographs selected, click <guilabel>Download</guilabel> and 
then <guilabel>Download Selected</guilabel>. The <guilabel>Download 
Selected</guilabel> button will be grayed out until you have selected some 
photographs.
+            If you do not want to download all of the photographs you can 
select just those that you need using the standard selection methods. Once you 
have the photographs selected, click <guilabel>Download</guilabel> and then 
<guilabel>Download Selected</guilabel>. The <guilabel>Download 
Selected</guilabel> button will be grayed out until you have selected some 
photographs.
             </para>
 
             <note><para>
@@ -1630,7 +1595,7 @@ Fun stuff
             </para>
 
             <caution><para>
-            Please note that there is no way to restore a photo that you have 
deleted from the camera. The photographs are not moved to the &kde; Trash Can, 
they are removed completely. It is best to double check that you have 
successfully downloaded a photograph into a &digikam; Album before you delete 
it from the camera. Anyway, if you plan to empty the camera card, you better do 
that from the camera menu because it is much quicker.
+            Please note that there is no way to restore a photo that you have 
deleted from the camera. The photographs are not moved to the internal Trash 
Can, they are removed completely. It is best to double check that you have 
successfully downloaded a photograph into a &digikam; Album before you delete 
it from the camera. Anyway, if you plan to empty the camera card, you better do 
that from the camera menu because it is much quicker.
             </para></caution>
 
         </sect2>
@@ -1728,7 +1693,7 @@ Fun stuff
         <title>Uploading Photographs to your camera</title>
 
             <para>
-            The simplest way to upload photographs from your computer to your 
camera is to click the <guilabel>Download</guilabel> button and then click 
<guilabel>Upload</guilabel>. A standard &kde; file selection dialog will appear 
to select the files from your computer to copying on your camera. You can 
select more than one file using the standard &kde; selection methods.
+            The simplest way to upload photographs from your computer to your 
camera is to click the <guilabel>Download</guilabel> button and then click 
<guilabel>Upload</guilabel>. A standard file selection dialog will appear to 
select the files from your computer to copying on your camera. You can select 
more than one file using the standard selection methods.
             </para>
 
             <para>
@@ -2138,7 +2103,7 @@ Fun stuff
             <sect3 id="setup-kipiplugins">            <title>Kipi Plugins 
Settings</title>
 
                 <para>
-                  Kipi is the &kde; Image Plugin Interface. It is an interface 
that is supported by a number of &kde; image viewer/editor applications. By 
providing this interface, &digikam; can take advantage of many plugins that are 
written to work with any application that implements the Kipi interface.
+                  Kipi is an Image Plugin Interface. It is an interface that 
is supported by a number of image viewer/editor applications. By providing this 
interface, &digikam; can take advantage of many plugins that are written to 
work with any application that implements the Kipi interface.
                 </para>
 
                <para>
@@ -2404,7 +2369,7 @@ Fun stuff
             <para>
             When you want to print the current image from the Image Editor, 
select
             <menuchoice><guimenu>File</guimenu>
-            <guimenuitem>Print image</guimenuitem></menuchoice> (&Ctrl;+P) and 
you get the standard &kde; Print dialog, where you can adjust the settings 
before printing your photograph.
+            <guimenuitem>Print image</guimenuitem></menuchoice> (&Ctrl;+P) and 
you get the standard Print dialog, where you can adjust the settings before 
printing your photograph.
             </para>
 
            <para>
@@ -2448,8 +2413,8 @@ from &kde; Extragear Git repository like this:
 </para>
 
 <para>
-The last releases can be downloaded at this &URL; <ulink 
url="ftp://ftp.kde.org/pub/kde/unstable/digikam/";>
-ftp://ftp.kde.org/pub/kde/unstable/digikam/</ulink>.
+The last releases can be downloaded at this &URL; <ulink 
url="ftp://ftp.kde.org/pub/kde/stable/digikam/";>
+ftp://ftp.kde.org/pub/kde/stable/digikam/</ulink>.
 </para>
 
 </sect1>
diff --git a/digikam/menu-descriptions.docbook 
b/digikam/menu-descriptions.docbook
index d03a13f..93ff79c 100644
--- a/digikam/menu-descriptions.docbook
+++ b/digikam/menu-descriptions.docbook
@@ -938,7 +938,7 @@
                 </para>
             </listitem>
         </varlistentry>
-        <!-- not ported to kde4
+        <!-- not ported to Qt5
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Export</guimenu><guimenuitem>Create MPEG 
Slideshow</guimenuitem>

Reply via email to