Git commit 00fe18f869048b0725106639c2679ecdb61fa81b by Burkhard L?ck.
Committed on 28/01/2013 at 20:10.
Pushed by lueck into branch 'master'.

remove outdated/broken links + old themes settings description
added new first run screenshots
fixed screenshot path to enable showfoto to pull these in

M  +4    -5    digikam/color-management.docbook
M  +30   -30   digikam/editor-enhance.docbook
M  +1    -1    digikam/editor-filters.docbook
M  +-    --    digikam/firstrunassistant_step1.png
M  +-    --    digikam/firstrunassistant_step2.png
M  +-    --    digikam/firstrunassistant_step3.png
M  +-    --    digikam/firstrunassistant_step4.png
M  +-    --    digikam/firstrunassistant_step5.png
M  +-    --    digikam/firstrunassistant_step6.png
M  +-    --    digikam/firstrunassistant_step7.png
M  +-    --    digikam/firstrunassistant_step8.png
M  +10   -135  digikam/index.docbook
M  +2    -2    digikam/menu-descriptions.docbook
D  +-    --    digikam/setupthemeclean.png
D  +-    --    digikam/setupthemedark.png
D  +-    --    digikam/setupthemedefault.png
D  +-    --    digikam/setupthemedessert.png
D  +-    --    digikam/setupthemedigicasa.png
D  +-    --    digikam/setupthemedreary.png
D  +-    --    digikam/setupthememarine.png
D  +-    --    digikam/setupthemeorangecrush.png
D  +-    --    digikam/setupthemesandy.png

http://commits.kde.org/digikam-doc/00fe18f869048b0725106639c2679ecdb61fa81b

diff --git a/digikam/color-management.docbook b/digikam/color-management.docbook
index b88d31e..b9dbb56 100644
--- a/digikam/color-management.docbook
+++ b/digikam/color-management.docbook
@@ -38,7 +38,7 @@
           <screeninfo></screeninfo>
           <mediaobject>
            <imageobject>
-            <imagedata fileref="542px-CIExy1931_sRGB_svg.png" format="PNG"/>
+            <imagedata fileref="&path;542px-CIExy1931_sRGB_svg.png" 
format="PNG"/>
            </imageobject>
            <textobject>
             <phrase></phrase>
@@ -85,7 +85,6 @@
           <itemizedlist>
           <listitem><para><ulink 
url="http://www.creativepro.com/article/the-darkroom-makes-a-comeback"; 
/></para></listitem>
           <listitem><para><ulink 
url="http://www.creativepro.com/article/the-darkroom-makes-a-comeback-part-2-"; 
/></para></listitem>
-          <listitem><para><ulink 
url="http://www.kevinmillsphoto.com/Articles/OfficeLightingArticle.html"; 
/></para></listitem>
           <listitem><para><ulink 
url="http://www.lrc.rpi.edu/programs/nlpip/lightingAnswers/fullSpectrum/abstract.asp";
 /></para></listitem>
           </itemizedlist>
          </sect3>
@@ -209,7 +208,7 @@
               <listitem><para>If you are working in 8-bits rather than 
16-bits, choose a smaller rather than a larger working space to avoid clipping 
and banding. </para></listitem>
               <listitem><para>For archival purposes, convert your raw file to 
a 16-bit tiff with a large gamut working space to avoid loosing color 
information. Then convert this archival tiff to your medium-gamut or 
large-gamut working space of choice (saving the converted working tiff under a 
new name, of course). </para></listitem>
           </orderedlist></para>
-          <para>For more information on choosing a working space, see <ulink 
url="http://www.brucelindbloom.com/Info";>this page</ulink>, Information about 
RGB Working Spaces for a visual comparison of the gamut (array of included 
colors) of the various working color spaces. See <ulink 
url="http://www.luminous-landscape.com/tutorials/prophoto-rgb.shtml";>here</ulink>
 and <ulink 
url="http://www.cambridgeincolour.com/tutorials/sRGB-AdobeRGB1998.htm";>here</ulink>
 for a pro- and con- presentation, respectively, of the merits of using large 
gamut working spaces. And while you are on the cambrideincolour.com website, 
check out the tutorial on color management. </para>
+          <para>For more information on choosing a working space, see <ulink 
url="http://www.brucelindbloom.com/";>this page</ulink>, Information about RGB 
Working Spaces for a visual comparison of the gamut (array of included colors) 
of the various working color spaces. See <ulink 
url="http://www.luminous-landscape.com/tutorials/prophoto-rgb.shtml";>here</ulink>
 and <ulink 
url="http://www.cambridgeincolour.com/tutorials/sRGB-AdobeRGB1998.htm";>here</ulink>
 for a pro- and con- presentation, respectively, of the merits of using large 
gamut working spaces. And while you are on the cambrideincolour.com website, 
check out the tutorial on color management. </para>
        </sect3>
      </sect2>
 
@@ -329,7 +328,7 @@
 
         <para>One practical consequence of the gamma of a working space is 
that the higher the gamma, the more tones are available for editing in the 
shadows, with consequently fewer tones available in the highlights. So 
theoretically, if you are working on a very dark-toned (low key) image you 
might want a working space with a higher gamma.  And if you are working on a 
high key image, say a picture taken in full noon sunlight of a wedding dress 
with snow as a backdrop, you might want to choose a working space with a lower 
gamma, so you have more available tonal gradations in the highlights. But in 
the real world of real image editing, almost everyone uses working spaces with 
either gamma 1.8 or 2.2.  </para>
         <para>Some people are trying to standardize on gamma 2.0.  sRGB and 
LStar-RGB are not gamma-based working spaces. Rather, sRGB uses a <ulink 
url="http://en.wikipedia.org/wiki/SRGB";>hybrid gamma</ulink>, and LStar-RGB 
uses a luminosity-based tonal response curve instead of a gamma value - see 
<ulink url="http://www.colormanagement.org/en/workingspaces.html";>here</ulink> 
for more information, and then google around for more in-depth information.  
</para>
-        <para>In addition to gamma 1.8 and gamma 2.2 the only other gamma for 
a working space that gets much mention or use is gamma 1.0, also called linear 
gamma. <emphasis>Linear gamma</emphasis> is used in HDR (high dynamic range) 
imaging and also if one wants to avoid introducing gamma-induced errors into 
one's regular low dynamic range editing. Gamma-induced errors is a topic 
outside the scope of this tutorial, but see <ulink 
url="http://www.4p8.com/eric.brasseur/gamma.html";>Gamma errors</ulink> in 
<ulink 
url="http://www.21stcenturyshoebox.com/essays/color_reproduction.html";>picture 
scaling,</ulink> for gamma-induced color shifts; and of course Timo Autiokari's 
somewhat infamous <ulink url="http://www.aim-dtp.net/";>website</ulink>. </para>
+        <para>In addition to gamma 1.8 and gamma 2.2 the only other gamma for 
a working space that gets much mention or use is gamma 1.0, also called linear 
gamma. <emphasis>Linear gamma</emphasis> is used in HDR (high dynamic range) 
imaging and also if one wants to avoid introducing gamma-induced errors into 
one's regular low dynamic range editing. Gamma-induced errors is a topic 
outside the scope of this tutorial, but see <ulink 
url="http://www.4p8.com/eric.brasseur/gamma.html";>Gamma errors</ulink> in 
<ulink 
url="http://www.21stcenturyshoebox.com/essays/color_reproduction.html";>picture 
scaling,</ulink> for gamma-induced color shifts. </para>
         <para>Unfortunately and despite their undeniable mathematical 
advantages, linear gamma working spaces have so few tones in the shadows that 
(in my opinion) they are impossible to use for editing if one is working in 
8-bits, and still problematic at 16-bits.  When the day comes when we are all 
doing our editing on 32-bit files produced by our HDR cameras on our personal 
supercomputers, I predict that we will all be using working spaces with gamma 
1; Adobe Lightroom is already using a linear gamma working space "under the 
hood" and Lightzone has always used a linear gamma working space. </para>
 
         <para>Which working space: <emphasis>large gamut</emphasis> or 
<emphasis>small gamut</emphasis></para>
@@ -340,7 +339,7 @@
           <listitem><para>For images intended for the web, use (one of the) 
sRGB (variants - there are several).  </para></listitem>
           <listitem><para>For the most accuracy in your image editing (that 
is, making the most of your "bits" with the least risk of banding or clipping 
when you convert your image from your working space to an output space), use 
the smallest working space that includes all the colors in the scene that you 
photographed, plus a little extra room for those new colors you intentionally 
produce as you edit.  </para></listitem>
           <listitem><para>If you are working in 8-bits rather than 16-bits, 
choose a smaller space rather than a larger space.</para></listitem>
-          <listitem><para>For archival purposes, convert your raw file to a 
16-bit tiff with a large gamut working space to avoid loosing color 
information. Then convert this archival tiff to your working space of choice 
(saving the converted working tiff under a new name, of course). See <ulink 
url="http://www.21stcenturyshoebox.com/essays/scenereferredworkflow.html";>here</ulink>
 for more details.</para></listitem>
+          <listitem><para>For archival purposes, convert your raw file to a 
16-bit tiff with a large gamut working space to avoid loosing color 
information. Then convert this archival tiff to your working space of choice 
(saving the converted working tiff under a new name, of course). See <ulink 
url="http://simon.tindemans.eu/essays/scenereferredworkflow";>here</ulink> for 
more details.</para></listitem>
         </orderedlist>
 
         <para>The WHYs of these bits of advice regarding which working space 
are beyond the scope of this tutorial.  See Bruce Lindbloom's excellent website 
(<ulink url="http://www.brucelindbloom.com/";>Info, Information about RGB 
Working Spaces</ulink>) for a visual comparison of the gamut (array of included 
colors) of the various working color spaces.  See <ulink 
url="http://www.luminous-landscape.com/tutorials/prophoto-rgb.shtml";>here</ulink>
 and <ulink 
url="http://www.cambridgeincolour.com/tutorials/sRGB-AdobeRGB1998.htm";>here</ulink>
 for a pro and con presentation, respectively, of the merits of using large 
gamut working spaces. And while you are on the <ulink 
url="http://www.cambridgeincolour.com/tutorials/sRGB-AdobeRGB1998.htm";>cambrideincolour.com</ulink>
 website, check out the tutorial on color management. </para>
diff --git a/digikam/editor-enhance.docbook b/digikam/editor-enhance.docbook
index 7b3d4ad..cd70df7 100644
--- a/digikam/editor-enhance.docbook
+++ b/digikam/editor-enhance.docbook
@@ -89,7 +89,7 @@ End:
             <screeninfo>The Sharpen Tool in Action</screeninfo>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="editorsharpenplugin.png" format="PNG" />
+                <imagedata fileref="&path;editorsharpenplugin.png" 
format="PNG" />
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -132,7 +132,7 @@ End:
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="unsharpdialog.png" format="PNG" />
+            <imagedata fileref="&path;unsharpdialog.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>Unsharp Mask Dialog</phrase>
@@ -164,7 +164,7 @@ End:
         <para>
           <inlinemediaobject>
             <imageobject>
-              <imagedata fileref="unsharppreview.png" format="PNG" />
+              <imagedata fileref="&path;unsharppreview.png" format="PNG" />
             </imageobject>
             <textobject>
               <phrase>Unsharp Mask Tool in Action</phrase>
@@ -194,7 +194,7 @@ End:
         <para>
           <inlinemediaobject>
             <imageobject>
-              <imagedata fileref="refocusdialog.png" format="PNG" />
+              <imagedata fileref="&path;refocusdialog.png" format="PNG" />
             </imageobject>
             <textobject>
               <phrase>Refocus Dialog</phrase>
@@ -313,7 +313,7 @@ End:
                   <para>
                     <inlinemediaobject>
                       <imageobject>
-                        <imagedata fileref="refocus-notsharpened.png" 
format="PNG" />
+                        <imagedata fileref="&path;refocus-notsharpened.png" 
format="PNG" />
                       </imageobject>
                     </inlinemediaobject>
                   </para>
@@ -327,7 +327,7 @@ End:
                   <para>
                     <inlinemediaobject>
                       <imageobject>
-                        <imagedata fileref="refocus-sharped.png" format="PNG" 
/>
+                        <imagedata fileref="&path;refocus-sharped.png" 
format="PNG" />
                       </imageobject>
                     </inlinemediaobject>
                   </para>
@@ -341,7 +341,7 @@ End:
                   <para>
                     <inlinemediaobject>
                       <imageobject>
-                        <imagedata fileref="refocus-unsharpmask.png" 
format="PNG" />
+                        <imagedata fileref="&path;refocus-unsharpmask.png" 
format="PNG" />
                       </imageobject>
                     </inlinemediaobject>
                   </para>
@@ -355,7 +355,7 @@ End:
                   <para>
                     <inlinemediaobject>
                       <imageobject>
-                        <imagedata fileref="refocus-refocus.png" format="PNG" 
/>
+                        <imagedata fileref="&path;refocus-refocus.png" 
format="PNG" />
                       </imageobject>
                     </inlinemediaobject>
                   </para>
@@ -400,7 +400,7 @@ End:
         <screeninfo>The Red Eyes Correction Tool in Action </screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="editor-redeyes-correction.png" format="PNG" />
+            <imagedata fileref="&path;editor-redeyes-correction.png" 
format="PNG" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -434,7 +434,7 @@ End:
           <ulink url="http://cimg.sourceforge.net"; >
             <inlinemediaobject>
               <imageobject>
-                <imagedata fileref="cimg-logo.png" format="PNG" />
+                <imagedata fileref="&path;cimg-logo.png" format="PNG" />
               </imageobject>
               <textobject>
                 <phrase>cimglogo</phrase>
@@ -461,7 +461,7 @@ The inpainting algorithm has been developed by the IMAGE 
team of GREC CNRS lab i
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="inpaintingdialog.png" format="PNG" />
+            <imagedata fileref="&path;inpaintingdialog.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Photograph Inpainting Dialog</phrase>
@@ -493,7 +493,7 @@ The inpainting algorithm has been developed by the IMAGE 
team of GREC CNRS lab i
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="inpaintingsettings1.png" format="PNG" />
+            <imagedata fileref="&path;inpaintingsettings1.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Inpainting Smoothing Settings</phrase>
@@ -527,7 +527,7 @@ The inpainting algorithm has been developed by the IMAGE 
team of GREC CNRS lab i
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="inpaintingsettings2.png" format="PNG" />
+            <imagedata fileref="&path;inpaintingsettings2.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Inpainting Advanced Settings</phrase>
@@ -567,7 +567,7 @@ Below, you can see a <guilabel>Remove Small Area</guilabel> 
Inpainting type appl
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="inpaintingpreview.png" format="PNG" />
+            <imagedata fileref="&path;inpaintingpreview.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Inpainting Filter Preview</phrase>
@@ -626,7 +626,7 @@ Moir&eacute; Patterns</emphasis> on scanned images from 
books or magazines.
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="noisereductiondialog.png" format="PNG" />
+            <imagedata fileref="&path;noisereductiondialog.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Noise Reduction Dialog</phrase>
@@ -714,7 +714,7 @@ You can see below a full description of all parameters. In 
most cases only <guil
         <para>
           <inlinemediaobject>
             <imageobject>
-              <imagedata fileref="noisereductionpreview.png" format="PNG" />
+              <imagedata fileref="&path;noisereductionpreview.png" 
format="PNG" />
             </imageobject>
             <textobject>
               <phrase>The Noise Reduction in Action</phrase>
@@ -736,7 +736,7 @@ You can see below a full description of all parameters. In 
most cases only <guil
             <screeninfo>The Blur Tool in Action</screeninfo>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="editorblurplugin.png" format="PNG" />
+                <imagedata fileref="&path;editorblurplugin.png" format="PNG" />
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -771,7 +771,7 @@ You can see below a full description of all parameters. In 
most cases only <guil
           <ulink url="http://cimg.sourceforge.net"; >
             <inlinemediaobject>
               <imageobject>
-                <imagedata fileref="cimg-logo.png" format="PNG" />
+                <imagedata fileref="&path;cimg-logo.png" format="PNG" />
               </imageobject>
               <textobject>
                 <phrase>cimglogo</phrase>
@@ -801,7 +801,7 @@ The same algorithm can be used for colorization and texture 
replacement which is
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="restorationdialog.png" format="PNG" />
+            <imagedata fileref="r&path;estorationdialog.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>Photograph Restoration Dialog</phrase>
@@ -833,7 +833,7 @@ The same algorithm can be used for colorization and texture 
replacement which is
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="restorationsettings1.png" format="PNG" />
+            <imagedata fileref="&path;restorationsettings1.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Restoration Smoothing Settings</phrase>
@@ -867,7 +867,7 @@ The same algorithm can be used for colorization and texture 
replacement which is
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="restorationsettings2.png" format="PNG" />
+            <imagedata fileref="&path;restorationsettings2.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Restoration Advanced Settings</phrase>
@@ -907,7 +907,7 @@ Below, you can see a <guilabel>Reduce Uniform 
Noise</guilabel> Restoration type
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="restorationpreview.png" format="PNG" />
+            <imagedata fileref="&path;restorationpreview.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>Reduce Uniform Noise Restoration Preview</phrase>
@@ -920,7 +920,7 @@ Below, you can see an another Photograph Restoration 
example using <guilabel>Red
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="restorationpreview2.png" format="PNG" />
+            <imagedata fileref="&path;restorationpreview2.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>Reduce Texturing Restoration Preview</phrase>
@@ -1007,7 +1007,7 @@ If you use an old digital camera, it is important to 
re-shoot the Black Frame ne
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="hotpixelsdialog.png" format="PNG" />
+            <imagedata fileref="&path;hotpixelsdialog.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Hot Pixels Dialog</phrase>
@@ -1047,7 +1047,7 @@ Below, you can see the Hot Pixels Correction tool applied 
to a color photograph
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="hotpixelspreview.png" format="PNG" />
+            <imagedata fileref="&path;hotpixelspreview.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Pixels Correction Preview</phrase>
@@ -1111,7 +1111,7 @@ The  <emphasis>Vignetting correction</emphasis> is a tool 
to correct image vigne
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="vignettingcorrectiondialog.png" format="PNG" />
+            <imagedata fileref="&path;vignettingcorrectiondialog.png" 
format="PNG" />
           </imageobject>
           <textobject>
             <phrase>The Vignetting Correction Dialog</phrase>
@@ -1183,7 +1183,7 @@ The values used for this example are:
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="antivignettingpreview.png" format="PNG" />
+            <imagedata fileref="&path;antivignettingpreview.png" format="PNG" 
/>
           </imageobject>
           <textobject>
             <phrase>The Vignetting Correction Image Editor Tool in 
Action</phrase>
@@ -1253,7 +1253,7 @@ The following figures explain the main types of 
geometrical distortions:
     <para>
       <inlinemediaobject>
         <imageobject>
-          <imagedata fileref="distortions.png" format="PNG" />
+          <imagedata fileref="&path;distortions.png" format="PNG" />
         </imageobject>
         <textobject>
           <phrase>Lens Distortion Types</phrase>
@@ -1285,7 +1285,7 @@ A bit of explanation first. The geometrical corrections 
use 4th-order polynomial
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="lensdistortiondialog.png" format="PNG" />
+            <imagedata fileref="&path;lensdistortiondialog.png" format="PNG" />
           </imageobject>
           <textobject>
             <phrase>Lens Distortion Correction Dialog</phrase>
@@ -1353,7 +1353,7 @@ The values used for this example are:
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="lensdistortionpreview.png" format="PNG" />
+            <imagedata fileref="&path;lensdistortionpreview.png" format="PNG" 
/>
           </imageobject>
           <textobject>
             <phrase>Lens Distortion Correction Preview</phrase>
diff --git a/digikam/editor-filters.docbook b/digikam/editor-filters.docbook
index 805549e..3d45b59 100644
--- a/digikam/editor-filters.docbook
+++ b/digikam/editor-filters.docbook
@@ -39,7 +39,7 @@ It is like taking an image in black and white with a red 
filter on the camera le
 
 <para>
 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) SFX200 infrared film, cf. 
<ulink url="www.ilford.com/html/us_english/prod_html/sfx200/sfx200.html">this 
url</ulink>. This film has a sensitivity range of 200-800 ISO.
+The filter tries to reproduce the famous Ilford(tm) SFX200 infrared film. This 
film has a sensitivity range of 200-800 ISO.
 </para>
 
 <sect4 id="using-infrared">
diff --git a/digikam/firstrunassistant_step1.png 
b/digikam/firstrunassistant_step1.png
index 1a83d5f..5361af0 100644
Binary files a/digikam/firstrunassistant_step1.png and 
b/digikam/firstrunassistant_step1.png differ
diff --git a/digikam/firstrunassistant_step2.png 
b/digikam/firstrunassistant_step2.png
index edc2bd2..9355cc0 100644
Binary files a/digikam/firstrunassistant_step2.png and 
b/digikam/firstrunassistant_step2.png differ
diff --git a/digikam/firstrunassistant_step3.png 
b/digikam/firstrunassistant_step3.png
index 024bbf5..4d37af4 100644
Binary files a/digikam/firstrunassistant_step3.png and 
b/digikam/firstrunassistant_step3.png differ
diff --git a/digikam/firstrunassistant_step4.png 
b/digikam/firstrunassistant_step4.png
index 06ae35a..9a9d602 100644
Binary files a/digikam/firstrunassistant_step4.png and 
b/digikam/firstrunassistant_step4.png differ
diff --git a/digikam/firstrunassistant_step5.png 
b/digikam/firstrunassistant_step5.png
index 6b5bfa5..b38aba7 100644
Binary files a/digikam/firstrunassistant_step5.png and 
b/digikam/firstrunassistant_step5.png differ
diff --git a/digikam/firstrunassistant_step6.png 
b/digikam/firstrunassistant_step6.png
index 283da70..277c365 100644
Binary files a/digikam/firstrunassistant_step6.png and 
b/digikam/firstrunassistant_step6.png differ
diff --git a/digikam/firstrunassistant_step7.png 
b/digikam/firstrunassistant_step7.png
index 44ff92d..7210d08 100644
Binary files a/digikam/firstrunassistant_step7.png and 
b/digikam/firstrunassistant_step7.png differ
diff --git a/digikam/firstrunassistant_step8.png 
b/digikam/firstrunassistant_step8.png
index 7184910..9094dfb 100644
Binary files a/digikam/firstrunassistant_step8.png and 
b/digikam/firstrunassistant_step8.png differ
diff --git a/digikam/index.docbook b/digikam/index.docbook
index 4899ec5..e4b1930 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -129,7 +129,7 @@
        An easy-to-use Camera interface is provided, that will connect to your 
digital camera and download photographs directly into &digikam; Albums. More 
than <ulink url="http://www.gphoto.org/proj/libgphoto2/support.php";>1000 
digital cameras</ulink> are supported by the gphoto2 library. Of course, any 
media or card reader supported by your operating system will interface with 
&digikam;.
        </para>
 
-       <para>&digikam; incorporates a fast Image Editor with many image 
editing tools. You can use the Image Editor to view your photographs, comment 
and rate them, correct, enhance and alter them. The editing power can be easily 
extended by a set of plugins, the <ulink url="http://www.kipi-plugins.org";>Kde 
Image Plugins Interface</ulink> (<ulink 
url="help:/kipi-plugins/index.html">manual</ulink>)
+       <para>&digikam; incorporates a fast Image Editor with many image 
editing tools. You can use the Image Editor to view your photographs, comment 
and rate them, correct, enhance and alter them. The editing power can be easily 
extended by a set of plugins, the <ulink 
url="https://projects.kde.org/projects/extragear/graphics/kipi-plugins";>Kde 
Image Plugins Interface</ulink> (<ulink 
url="help:/kipi-plugins/index.html">manual</ulink>)
        </para>
 
        <para>While &digikam; remains easy to use, it provides professional 
level features by the dozens. It is fully 16 bit enabled including all 
available plugins, supports RAW format conversion through libraw, DNG export 
and ICC color management <link linkend="rawprocessing.anchor">work flow</link>.
@@ -430,7 +430,7 @@
 
         <itemizedlist>
 
-                <listitem><para><emphasis>Kipi Plugins</emphasis>: the <ulink 
url="http://www.kipi-plugins.org";>Kde Image Plugins Interface project 
(Kipi)</ulink>  (<ulink url="help:/kipi-plugins/index.html">manual</ulink>) is 
an effort to develop a common plugin structure for &digikam;, 
<application>KPhotoAlbum</application>, <application>Showimg</application> and 
<application>Gwenview</application>. Its aim is to share image plugins among 
graphical applications. Kipi-Plugins setup is described in this <link 
linkend="setup-kipiplugins">section</link>.</para></listitem>
+                <listitem><para><emphasis>Kipi Plugins</emphasis>: the <ulink 
url="https://projects.kde.org/projects/extragear/graphics/kipi-plugins";>Kde 
Image Plugins Interface project (Kipi)</ulink>  (<ulink 
url="help:/kipi-plugins/index.html">manual</ulink>) is an effort to develop a 
common plugin structure for &digikam;, <application>KPhotoAlbum</application>, 
<application>Showimg</application> and <application>Gwenview</application>. Its 
aim is to share image plugins among graphical applications. Kipi-Plugins setup 
is described in this <link 
linkend="setup-kipiplugins">section</link>.</para></listitem>
 
         </itemizedlist>
 
@@ -1429,7 +1429,6 @@ Fun stuff
         <listitem><para>if not physically separated already, separate it now 
(swapping-in another backup drive)</para></listitem>
 </orderedlist>
       <para>This protocol tries to leave you enough time to spot losses and to 
recover fully at the same time keeping the backup volume at &lt;130% of the 
working space. You end up with a daily version of the last 7-14 days, a weekly 
snapshot for at least one month, and a snapshot of every month. Any more 
thinning should be done by hand after a full verification.</para>
-      <para>script to follow....TBD</para>
       <para>For German speaking *nix users: <ulink 
url="http://www.heinlein-support.de/web/rsync-backup/";> link</ulink></para>
      </sect4>
     </sect3>
@@ -1669,7 +1668,7 @@ Fun stuff
                   <listitem><para>The sequence number may be needed if you 
have a camera with a very fast multi-shoot mode where it is possible to get two 
photographs with exactly the same data and time.
        </para></listitem>
 
-                    <listitem><para>If you want another date format then the 
default date format, click on <guilabel>Date &amp; Time...</guilabel>, choose 
<guilabel>Custom</guilabel> in <guilabel>Format</guilabel> drop-down list and 
fill in for example "dd.MM.yyyy hh:mm:ss". For more information, read <ulink 
url="http://doc.trolltech.com/latest/qdatetime.html#toString";>QdateTime</ulink> 
class reference.</para></listitem>
+                    <listitem><para>If you want another date format then the 
default date format, click on <guilabel>Date &amp; Time...</guilabel>, choose 
<guilabel>Custom</guilabel> in <guilabel>Format</guilabel> drop-down list and 
fill in for example "dd.MM.yyyy hh:mm:ss". For more information, read <ulink 
url="http://doc.qt.digia.com/qt/qdatetime.html#toString";>QdateTime</ulink> 
class reference.</para></listitem>
 
                     <listitem><para>When you select <guilabel>Camera 
filenames</guilabel>, you have the option to change the filenames to lowercase 
when downloading. Or use uppercase if you prefer.</para></listitem>
 
@@ -1764,7 +1763,7 @@ Fun stuff
                 But if, after some time, one has forgotten where the image was 
taken, if one loves the nice feature to open with a simple click a browser 
displaying a zoom of the area, if you like to send your image as a postcard to 
another &digikam; user (who is then able to locate your shot), or if you simply 
need the documentation aspect of it - having position data stored in a photo is 
great.
             </para>
             <para>
-                Now, how do we get GPS data into the images?  <ulink 
url="http://www.exiv2.org/tags.html";>exiv2</ulink> supports many kinds of the 
GPS data fields, even bearing, satellite and map references. So the question is 
really how to get the data into those fields? There are at least three ways to 
do this: directly with the appropriate hardware, per post-treatment of GPS and 
image files using the <ulink 
url="http://www.kipi-plugins.org";>Geolocation</ulink> (<ulink 
url="help:/kipi-plugins/geolocalization.html">Manual</ulink>) Kipi-plugin and 
per 'manual' insertion of known locations.
+                Now, how do we get GPS data into the images?  <ulink 
url="http://www.exiv2.org/tags.html";>exiv2</ulink> supports many kinds of the 
GPS data fields, even bearing, satellite and map references. So the question is 
really how to get the data into those fields? There are at least three ways to 
do this: directly with the appropriate hardware, per post-treatment of GPS and 
image files using the Geolocation Kipi-plugin (<ulink 
url="help:/kipi-plugins/geolocalization.html">Manual</ulink>) and per 'manual' 
insertion of known locations.
             </para>
             <itemizedlist>
 
@@ -1774,23 +1773,16 @@ Fun stuff
                     </para>
                     <para><ulink 
url="http://www.engadget.com.nyud.net:8090/2004/09/17/diy-black-box-tagging-photos-with-gps-coordinates/";>Selfmade
 Howto</ulink>
                     </para>
-                    <para>Cameras with GPS interface:
-                        <ulink 
url="http://www.lupinelogic.com/products/coyoteye.html";>CoyoteEye iPAQ</ulink>
-                        <ulink url="http://www.survey-lab.com/";>Ike</ulink>
-                        <ulink 
url="http://www.kodak.com/global/en/service/professional/tib/tib7061.jhtml?id=0.1.14.34.3.110&amp;lc=en";>Kodak
 DCS Pro</ulink>
-                        <ulink 
url="http://nikonimaging.com/global/products/digitalcamera/index.htm";>Nikon 
DSLR</ulink>
-                        <ulink 
url="http://www.geospatialexperts.com/ricoh.html";>Ricoh Pro G3</ulink>        
<ulink 
url="http://digitalcameras.engadget.com/2004/04/30/gps-attachment-for-sony-digital-camcorders/";>Sony</ulink>
-                    </para>
                 </listitem>
 
                 <listitem><para>Post-treatment of GPS data and image 
files</para>
                     <para>
-                        Using the <ulink 
url="http://www.kipi-plugins.org";>Geolocation</ulink> Kipi-plugin (<ulink 
url="help:/kipi-plugins/geolocalization.html">Manual</ulink> if Kipi-plugins 
are already installed).
+                        Using the Geolocation Kipi-plugin (<ulink 
url="help:/kipi-plugins/geolocalization.html">Manual</ulink> if Kipi-plugins 
are already installed).
                     </para>
                     <para>
                         This approach is dead easy: while taking your pictures 
just keep a GPS device running and carry it around with the camera. Once you 
are done, download the pictures and the GPS tracks, and run the above plugin. 
It will correlate the data in the time domain; so it is important that the 
camera be accurate in its clock setting (the GPS device is always accurate 
through the satellites). The positional accuracy interpolated from the track 
points can be as good as 20 meters. Of course, this approach only works if your 
camera can record EXIF data.
                     </para>
-                    <para>The GPS track download from a device can be managed 
with the <ulink url="http://www.ncc.up.pt/gpsman";>gpsman</ulink> or <ulink 
url="http://www.gpsbabel.org";>gpsbabel</ulink>. It is important that the 
downloaded tracks are being stored in gpx format, which is the only one 
compatible with the Geolocation plugin.
+                    <para>The GPS track download from a device can be managed 
with the <ulink url="http://gpsman.sourceforge.net/";>gpsman</ulink> or <ulink 
url="http://www.gpsbabel.org";>gpsbabel</ulink>. It is important that the 
downloaded tracks are being stored in gpx format, which is the only one 
compatible with the Geolocation plugin.
                     </para>
                     <para>
                         Several programs exist for &Windows; and MacOS that 
are able to extract and correlate data from images and GPS data tracks. The 
following site provides the same functionality for &Linux;:
@@ -1803,9 +1795,6 @@ Fun stuff
                     <para>'Manual' insertion of known locations</para>
                     <para>If you happen to know the latitude/longitude or 
other data you can use the this script which is a GPS wrapper for Phil Harvey's 
<ulink url="http://www.sno.phy.queensu.ca/~phil/exiftool";>ExifTool</ulink> that 
uses the signed floating number coordinate notation as produced by maps.google.
                     </para>
-                    <tip><para>
-                            maps.google.com does not show the street maps of 
Europe. But there are European sites (.fr .de .es .it .co .uk at least) that 
show all navigation details in all of Europe.
-                    </para></tip>
                 </listitem>
 
             </itemizedlist>
@@ -1813,7 +1802,6 @@ Fun stuff
             <para>
                 GPS devices:
                <ulink 
url="http://www.letsgodigital.org/en/9323/sony_gps_photography/";>GPS tracker 
from Sony </ulink> and
-               <ulink url="http://photofinder.atpinc.com/";>ATP Fotofinder GPS 
tracker</ulink>
                 <ulink 
url="http://www.emtac.com/products/bluetooth/index.html#btgps";>EMTAC bluetooth 
GPS </ulink>
             </para>
         </sect2>
@@ -2053,7 +2041,7 @@ Fun stuff
                 <para>For Fuji Super CCD SLR cameras only. Use the secondary 
sensors, in effect underexposing the image by four stops to reveal detail in 
the highlights. For all other camera types this option is being ignored.</para>
 
                 <para><guilabel>Highlights</guilabel></para>
-                <para>This is the story of the three highlight options, 
courtesy of <ulink url="http://linux.vilars.com/";>Nicolas Vilars</ulink> 
:</para>
+                <para>This is the story of the three highlight options, 
courtesy of Nicolas Vilars:</para>
                 <para>Default is here to consider highlights (read: part of 
your images that are burned due to the inability of your camera to capture the 
highlights) as plain / solid white (<guilabel>solid white</guilabel> option). 
You can get some fancy results with the <guilabel>unclip</guilabel> option 
which will paint the highlights in various pinks. At last you can try to 
consider recovering some parts of the missing information from the highlights 
(<guilabel>reconstruct</guilabel> option).</para>
                 <para>
                   This is possible because the blue pixels tends to saturate 
less quickly than the greens and the reds. &digikam;/dcraw will try to 
reconstruct the missing green and red colors from the remaining none saturated 
blue pixels. Of course here everything is a question of tradeoff between how 
much color or white you want.</para>
@@ -2171,7 +2159,7 @@ Fun stuff
                 </para>
 
                 <para>
-                  For more information about Kipi plugins, you can consult the 
Kipi project at <ulink 
url="http://www.kipi-plugins.org";>http://www.kipi-plugins.org</ulink> or the 
<ulink url="help:/kipi-plugins/index.html">Kipi-plugins manual</ulink>.
+                  For more information about Kipi plugins, you can consult the 
<ulink url="help:/kipi-plugins/index.html">Kipi-plugins manual</ulink>.
                 </para>
 
             </sect3>
@@ -2254,117 +2242,8 @@ Fun stuff
             <para>
             Color schemes are supplied like themes to personalize &digikam; 
main interface for you pleasure. To access these settings select
             <menuchoice><guimenu>Settings</guimenu>
-            <guimenuitem>Themes</guimenuitem></menuchoice> from the menubar 
and select your preferred theme to use. A preview of the available themes is 
listed below:
+            <guimenuitem>Themes</guimenuitem></menuchoice> from the menubar 
and select your preferred theme to use.
             </para>
-
-            <informaltable><tgroup cols="2">
-
-            <thead><row>
-                <entry>Preview</entry>
-                <entry>Theme Name</entry>
-            </row></thead>
-
-            <tbody>
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemeclean.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Clean
-                    </entry>
-                </row>
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemedark.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Dark
-                    </entry>
-                </row>
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemedefault.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Default
-                    </entry>
-                </row>
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemedessert.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Dessert
-                    </entry>
-                </row>
-
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemedigicasa.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Digicasa
-                    </entry>
-                </row>
-
-
-                <row>
-                    <entry>
-                     <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemedreary.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Dreary
-                    </entry>
-                </row>
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthememarine.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Marine
-                    </entry>
-                </row>
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemeorangecrush.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    OrangeCrush
-                    </entry>
-                </row>
-
-                <row>
-                    <entry>
-                    <inlinemediaobject><imageobject><imagedata 
fileref="&path;setupthemesandy.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-                    </entry>
-
-                    <entry>
-                    Sandy
-                    </entry>
-                </row>
-
-            </tbody>
-
-            </tgroup></informaltable>
-
-            <note><para>
-              Theme settings are implemented in simple text file. If you are 
interested to create a new theme for &digikam;, you can find more information 
about it in this <ulink 
url="http://www.digikam.org/themeguide.html";>tutorial</ulink>.
-            </para></note>
-
         </sect2>
 
     </sect1>
@@ -2531,10 +2410,6 @@ Fun stuff
             <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.
             </para>
 
-            <para>
-            For more information about advanced printing settings, please 
consult <ulink url="help:/kdeprint/index.html">&kde; Print manual</ulink>.
-            </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.
            </para>
@@ -2559,7 +2434,7 @@ Fun stuff
 <sect1 id="getting-kapp">                <title>How to Obtain &digikam;</title>
 
 <para>
-The website for &digikam; is at <ulink 
url="http://www.digikam.org";>http://www.digikam.org</ulink>. Please check it 
regularly to get the latest news about &digikam;. &digikam; can be obtained in 
binary and source format from <ulink 
url="http://sourceforge.net/project/showfiles.php?group_id=42641";>http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>.
+The website for &digikam; is at <ulink 
url="http://www.digikam.org";>http://www.digikam.org</ulink>. Please check it 
regularly to get the latest news about &digikam;. &digikam; can be obtained in 
binary and source format from the digiKam web site.
 </para>
 
 <para>
diff --git a/digikam/menu-descriptions.docbook 
b/digikam/menu-descriptions.docbook
index c6ac235..d03a13f 100644
--- a/digikam/menu-descriptions.docbook
+++ b/digikam/menu-descriptions.docbook
@@ -938,7 +938,7 @@
                 </para>
             </listitem>
         </varlistentry>
-        
+        <!-- not ported to kde4
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Export</guimenu><guimenuitem>Create MPEG 
Slideshow</guimenuitem>
@@ -954,7 +954,7 @@
                 </para>     
             </listitem>
         </varlistentry>
-        
+       -->
         <varlistentry>
             <term><menuchoice>
                 <guimenu>Export</guimenu><guimenuitem>Remote Gallery 
sync...</guimenuitem>
diff --git a/digikam/setupthemeclean.png b/digikam/setupthemeclean.png
deleted file mode 100644
index 9f07ec4..0000000
Binary files a/digikam/setupthemeclean.png and /dev/null differ
diff --git a/digikam/setupthemedark.png b/digikam/setupthemedark.png
deleted file mode 100644
index 8e899fa..0000000
Binary files a/digikam/setupthemedark.png and /dev/null differ
diff --git a/digikam/setupthemedefault.png b/digikam/setupthemedefault.png
deleted file mode 100644
index 4252912..0000000
Binary files a/digikam/setupthemedefault.png and /dev/null differ
diff --git a/digikam/setupthemedessert.png b/digikam/setupthemedessert.png
deleted file mode 100644
index 9096021..0000000
Binary files a/digikam/setupthemedessert.png and /dev/null differ
diff --git a/digikam/setupthemedigicasa.png b/digikam/setupthemedigicasa.png
deleted file mode 100644
index 1d61002..0000000
Binary files a/digikam/setupthemedigicasa.png and /dev/null differ
diff --git a/digikam/setupthemedreary.png b/digikam/setupthemedreary.png
deleted file mode 100644
index 553f49c..0000000
Binary files a/digikam/setupthemedreary.png and /dev/null differ
diff --git a/digikam/setupthememarine.png b/digikam/setupthememarine.png
deleted file mode 100644
index 5a7aaa3..0000000
Binary files a/digikam/setupthememarine.png and /dev/null differ
diff --git a/digikam/setupthemeorangecrush.png 
b/digikam/setupthemeorangecrush.png
deleted file mode 100644
index 45e64d8..0000000
Binary files a/digikam/setupthemeorangecrush.png and /dev/null differ
diff --git a/digikam/setupthemesandy.png b/digikam/setupthemesandy.png
deleted file mode 100644
index 593e293..0000000
Binary files a/digikam/setupthemesandy.png and /dev/null differ

Reply via email to