Git commit f0efb6cfd02f4049e83262dbe066f3b86ed2e1e4 by Gilles Caulier.
Committed on 23/08/2016 at 14:05.
Pushed by cgilles into branch 'master'.

rename PNG

M  +22   -14   digikam/intro-camerasupport.docbook
M  +192  -179  digikam/intro-fileformats.docbook
R  +-    --    digikam/intro-firewireconnector.png [from: 
digikam/introductionfirewireconnector.png - 100% similarity]
M  +142  -116  digikam/intro-firstrun.docbook
R  +-    --    digikam/intro-firstrundialog.png [from: 
digikam/introductionfirstrundialog.png - 100% similarity]
R  +-    --    digikam/intro-plugininterface.png [from: 
digikam/introductionplugininterfaces.png - 100% similarity]
M  +4    -10   digikam/intro-pluginsupport.docbook
R  +-    --    digikam/intro-serialconnector.png [from: 
digikam/introductionserialconnector.png - 100% similarity]
R  +-    --    digikam/intro-usbconnector.png [from: 
digikam/introductionusbconnector.png - 100% similarity]
D  +-    --    digikam/introductionfoldericon.png
M  +1    -1    digikam/using-bqm.docbook

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

diff --git a/digikam/intro-camerasupport.docbook 
b/digikam/intro-camerasupport.docbook
index 2922ffe..df59b1f 100644
--- a/digikam/intro-camerasupport.docbook
+++ b/digikam/intro-camerasupport.docbook
@@ -1,31 +1,39 @@
-<sect1 id="intro-camerasupport">      <title>Supported Digital Still 
Cameras</title>
-<anchor id="digitalstillcamera.anchor"/>
+<sect1 id="intro-camerasupport"> <title>Supported Digital Still Cameras</title>
+    <anchor id="digitalstillcamera.anchor"/>
+
+    <note>
+
+        <para>
+            RAW file support: if you are using RAW shooting mode with your 
camera, &digikam; is probably well able to deal with it. RAW support depends on 
the libraw library. To find out if your particular camera is supported, bring 
up the list of supported RAW cameras from the 
<menuchoice><guimenu>Help</guimenu><guimenuitem>RAW camera 
support</guimenuitem></menuchoice> menu.
+        </para>
+
+        <para>
+            How to setup and work with RAW files is described in <link 
linkend="setup-raw-decoder">RAW Decoder Settings</link> and <link 
linkend="raw-workflow">RAW Workflow</link>.
+        </para>
 
-    <note><para>
-        RAW file support: if you are using RAW shooting mode with your camera, 
&digikam; is probably well able to deal with it. RAW support depends on the 
libraw library. To find out if your particular camera is supported, bring up 
the list of supported RAW cameras from the 
<menuchoice><guimenu>Help</guimenu><guimenuitem>RAW camera 
support</guimenuitem></menuchoice> menu.
-    </para>
-    <para>
-        How to setup and work with RAW files is described in <link 
linkend="setup-raw-decoder">RAW Decoder Settings</link> and <link 
linkend="raw-workflow">RAW Workflow</link>.</para>
     </note>
 
     <para>
         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>
         Current digital cameras are characterized by the use of 
<emphasis>Compact &Flash; Memory</emphasis> cards and <emphasis>USB</emphasis> 
or <emphasis>FireWire (IEEE-1394 or i-link)</emphasis> for data transmission. 
The actual transfers to a host computer are commonly carried out using the 
<emphasis>USB Mass Storage</emphasis> device class (so that the camera appears 
as a disk drive) or using the <emphasis>Picture Transfer Protocol 
(PTP)</emphasis> and its derivatives. Older cameras may use the 
<emphasis>Serial Port (RS-232)</emphasis> connection.
     </para>
 
     <informaltable><tgroup cols="2">
 
-    <thead><row>
-        <entry>Preview Example</entry>
-        <entry>Connector Type</entry>
-    </row></thead>
+    <thead>
+        <row>
+            <entry>Preview Example</entry>
+            <entry>Connector Type</entry>
+        </row>
+    </thead>
 
     <tbody>
         <row>
             <entry>
-            <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;introductionfirewireconnector.png" format="PNG" /> 
</imageobject></inlinemediaobject></para>
+            <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;intro-firewireconnector.png" format="PNG" /> 
</imageobject></inlinemediaobject></para>
             </entry>
 
             <entry>
@@ -35,7 +43,7 @@
 
         <row>
             <entry>
-            <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;introductionusbconnector.png" format="PNG" /> 
</imageobject></inlinemediaobject></para>
+            <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;intro-usbconnector.png" format="PNG" /> 
</imageobject></inlinemediaobject></para>
             </entry>
 
             <entry>
@@ -45,7 +53,7 @@
 
         <row>
             <entry>
-            <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;introductionserialconnector.png" format="PNG" /> 
</imageobject></inlinemediaobject></para>
+            <para><inlinemediaobject><imageobject><imagedata 
fileref="&path;intro-serialconnector.png" format="PNG" /> 
</imageobject></inlinemediaobject></para>
             </entry>
 
             <entry>
diff --git a/digikam/intro-fileformats.docbook 
b/digikam/intro-fileformats.docbook
index d9b47a4..61caba3 100644
--- a/digikam/intro-fileformats.docbook
+++ b/digikam/intro-fileformats.docbook
@@ -1,241 +1,254 @@
- <sect1 id="using-fileformatsupport">  <title>Supported File Formats</title>
+<sect1 id="using-fileformat"> <title>Supported File Formats</title>
 
-        <para>
-        &digikam; relies on a number of libraries and support packages to load 
and save image formats. Which image formats are available will depend on the 
availability of these libraries on your system and, in some cases, on the way 
that those libraries have been compiled. On most distributions you will find 
that a wide range of image formats are viewable within &digikam;.
-        </para>
+    <para>
+    &digikam; relies on a number of libraries and support packages to load and 
save image formats. Which image formats are available will depend on the 
availability of these libraries on your system and, in some cases, on the way 
that those libraries have been compiled. On most distributions you will find 
that a wide range of image formats are viewable within &digikam;.
+    </para>
 
-        <para>
-        This dependence on other libraries means that it is not possible to 
give a definitive list of all of the formats that will be available on your 
system. At the very least JPEG, PNG, and TIFF should be available.
-        </para>
+    <para>
+    This dependence on other libraries means that it is not possible to give a 
definitive list of all of the formats that will be available on your system. At 
the very least JPEG, PNG, and TIFF should be available.
+    </para>
 
-        <para>
-        &digikam; only displays files that are in formats that it understands. 
It does this by looking at the file extension on the files and checking this 
against a predefined list. If the file extension is in the list &digikam; will 
show the file in the Image View, provided the appropriate library is installed. 
You can change the list of file extensions that &digikam; will accept, see the 
<link linkend="using-setup">Configuration</link> section for more details.
-        </para>
+    <para>
+    &digikam; only displays files that are in formats that it understands. It 
does this by looking at the file extension on the files and checking this 
against a predefined list. If the file extension is in the list &digikam; will 
show the file in the Image View, provided the appropriate library is installed. 
You can change the list of file extensions that &digikam; will accept, see the 
<link linkend="using-setup">Configuration</link> section for more details.
+    </para>
+
+    <sect2> <title>Still Photograph Formats</title>
+
+        <sect3> <title>Introduction</title>
 
-        <sect2>        <title>Still Photograph Formats</title>
+            <para>
+            Almost all digital cameras store photographs in one of two 
formats: JPEG or TIFF. Many cameras enable you to select which of these formats 
to use. A full description of these formats can be found at the <ulink 
url="http://en.wikipedia.org/wiki/Graphics_file_format";>Wikipedia</ulink>. 
&digikam; supports both of these formats.
+            </para>
 
-            <sect3>            <title>Introduction</title>
+        </sect3>
 
-                <para>
-                Almost all digital cameras store photographs in one of two 
formats: JPEG or TIFF. Many cameras enable you to select which of these formats 
to use. A full description of these formats can be found at the <ulink 
url="http://en.wikipedia.org/wiki/Graphics_file_format";>Wikipedia</ulink>. 
&digikam; supports both of these formats.
-                </para>
+        <sect3> <title>Still Image Compression</title>
 
-            </sect3>
+            <para>
+            Image compression is the application of data compression schemes 
on digital images. It is done through reducing redundancy of the image data in 
order to be able to store or transmit data in an efficient form.
+            </para>
 
-            <sect3>            <title>Still Image Compression</title>
+            <para>
+            Image compression can be lossy or lossless. Lossless compression 
methods are always preferred for their high preservation value for archival 
purposes before applying transformations like cropping, resizing, color 
corrections, &etc; This is because lossy compression methods, especially when 
used at low bit rates, introduce compression artifacts. Lossy methods are 
suitable for natural images such as photos in applications where minor 
(sometimes imperceptible) loss of fidelity is acceptable to achieve a 
substantial reduction in file size. Lossy compression is good for image 
publishing on the Internet.
+            </para>
 
-                <para>
-                Image compression is the application of data compression 
schemes on digital images. It is done through reducing redundancy of the image 
data in order to be able to store or transmit data in an efficient form.
-                </para>
+        </sect3>
 
-                <para>
-                Image compression can be lossy or lossless. Lossless 
compression methods are always preferred for their high preservation value for 
archival purposes before applying transformations like cropping, resizing, 
color corrections, &etc; This is because lossy compression methods, especially 
when used at low bit rates, introduce compression artifacts. Lossy methods are 
suitable for natural images such as photos in applications where minor 
(sometimes imperceptible) loss of fidelity is acceptable to achieve a 
substantial reduction in file size. Lossy compression is good for image 
publishing on the Internet.
-                </para>
+        <sect3> <title>JPEG</title>
+            <para>
+            JPEG is a compressed format, that trades some of the image quality 
to keep file sizes small. In fact, most cameras save their images in this 
format unless you specify otherwise. A JPEG image is stored using lossy 
compression and you can vary the amount of compression. This allows you to 
choose between lower compression and higher image quality or greater 
compression and poorer quality. The only reason to choose higher compression is 
because it creates smaller file so you can store more images, and it's easier 
to send them by e-mail, or post them on the Web. Most cameras give you two or 
three choices equivalent to good, better, best although the names vary.
+            </para>
+            
+            <para>
+            JPEG 2000 is supported as well. It provides for the same 
compression ratio the better (smoother) results compared to JPEG. The 2000 
version has the option of being lossless if so specified in the settings.
+            </para>
 
-            </sect3>
+        </sect3>
 
-            <sect3>            <title>JPEG</title>
-                <para>
-                JPEG is a compressed format, that trades some of the image 
quality to keep file sizes small. In fact, most cameras save their images in 
this format unless you specify otherwise. A JPEG image is stored using lossy 
compression and you can vary the amount of compression. This allows you to 
choose between lower compression and higher image quality or greater 
compression and poorer quality. The only reason to choose higher compression is 
because it creates smaller file so you can store more images, and it's easier 
to send them by e-mail, or post them on the Web. Most cameras give you two or 
three choices equivalent to good, better, best although the names vary.
-                </para>
-                <para>
-                JPEG 2000 is supported as well. It provides for the same 
compression ratio the better (smoother) results compared to JPEG. The 2000 
version has the option of being lossless if so specified in the settings.
-                </para>
+        <sect3> <title>TIFF</title>
 
-            </sect3>
+            <para>
+            TIFF has been widely accepted and widely supported as an image 
format. Commonly, TIFF may be stored by the camera in uncompressed form or 
using lossless compression algorithm (Deflate). It maintains higher image 
quality but at the expense of much larger file sizes. Some cameras let you save 
your images in this format and it is a popular format because of its lossless 
compression algorithm. The problem is that the format has been altered by so 
many people that there are now 50 or more flavors and not all are recognizable 
by programs.
+            </para>
 
-            <sect3>            <title>TIFF</title>
-                <para>
-                TIFF has been widely accepted and widely supported as an image 
format. Commonly, TIFF may be stored by the camera in uncompressed form or 
using lossless compression algorithm (Deflate). It maintains higher image 
quality but at the expense of much larger file sizes. Some cameras let you save 
your images in this format and it is a popular format because of its lossless 
compression algorithm. The problem is that the format has been altered by so 
many people that there are now 50 or more flavors and not all are recognizable 
by programs.
-                </para>
+        </sect3>
 
-            </sect3>
+        <sect3> <title>PNG</title>
 
-            <sect3>            <title>PNG</title>
-                <para>
-                PNG is an image format that was developed as a replacement for 
a number of older, in the 1990's widely used, image file formats. It is a 
lossless format like TIFF but it is much more compact and saves disk space. 
Although your camera is unlikely to support PNG, some people like to convert 
their photographs to PNG as soon as they get them on their computer. Unlike 
JPEG, PNG images do not lose quality every time you re-encode them after 
modification. &digikam; fully supports PNG images and the Batch Processing 
Images Plugin can convert a batch of images from any supported format to PNG in 
one step. See the <link linkend="using-setup">Configuration</link> section for 
information about using plugins with &digikam;.
-                </para>
+            <para>
+            PNG is an image format that was developed as a replacement for a 
number of older, in the 1990's widely used, image file formats. It is a 
lossless format like TIFF but it is much more compact and saves disk space. 
Although your camera is unlikely to support PNG, some people like to convert 
their photographs to PNG as soon as they get them on their computer. Unlike 
JPEG, PNG images do not lose quality every time you re-encode them after 
modification. &digikam; fully supports PNG images and the Batch Processing 
Images Plugin can convert a batch of images from any supported format to PNG in 
one step. See the <link linkend="using-setup">Configuration</link> section for 
information about using plugins with &digikam;.
+            </para>
 
-                <para>
-                PNG is an extensible file format for the lossless, portable, 
well-compressed storage of raster images. PNG provides a patent-free 
replacement for &GIF; and can also replace many common uses of TIFF. PNG is 
designed to work well in on-line viewing applications, such as the World Wide 
Web, so it is fully streamable with a progressive display option. Also, PNG can 
store gamma and chromaticity data for improved color matching on heterogeneous 
platforms. PNG supports 8 and 16 bits / colors /pixels depth. It's the perfect 
file format to archive your photographs. For more information about the PNG 
format see the <ulink url="http://www.libpng.org/pub/png/";>PNG homepage</ulink>.
-                </para>
+            <para>
+            PNG is an extensible file format for the lossless, portable, 
well-compressed storage of raster images. PNG provides a patent-free 
replacement for &GIF; and can also replace many common uses of TIFF. PNG is 
designed to work well in on-line viewing applications, such as the World Wide 
Web, so it is fully streamable with a progressive display option. Also, PNG can 
store gamma and chromaticity data for improved color matching on heterogeneous 
platforms. PNG supports 8 and 16 bits / colors /pixels depth. It's the perfect 
file format to archive your photographs. For more information about the PNG 
format see the <ulink url="http://www.libpng.org/pub/png/";>PNG homepage</ulink>.
+            </para>
 
-            </sect3>
+        </sect3>
 
-            <sect3>            <title>PGF</title>
-               <para>
-                "Progressive Graphics File" is another not so known but open 
file image format. Wavelet-based, it allows lossless and lossy data 
compression. PGF compares well with JPEG 2000 but it was developed for speed 
(compression/decompression) rather than to be the best at compression ratio. At 
the same file size a PGF file looks significantly better than a JPEG one, while 
remaining very good at progressive display too. Thus it should be well-suited 
to the web but at the moment few browsers can display it. For more information 
about the PGF format see the <ulink url="http://www.libpgf.org/";>libPGF 
homepage</ulink>.
+        <sect3> <title>PGF</title>
+
+            <para>
+            "Progressive Graphics File" is another not so known but open file 
image format. Wavelet-based, it allows lossless and lossy data compression. PGF 
compares well with JPEG 2000 but it was developed for speed 
(compression/decompression) rather than to be the best at compression ratio. At 
the same file size a PGF file looks significantly better than a JPEG one, while 
remaining very good at progressive display too. Thus it should be well-suited 
to the web but at the moment few browsers can display it. For more information 
about the PGF format see the <ulink url="http://www.libpgf.org/";>libPGF 
homepage</ulink>.
             </para> 
 
-            </sect3>
+        </sect3>
 
-            <sect3>            <title>RAW</title>
+        <sect3> <title>RAW</title>
 
-                <para>
-                Some, typically more expensive, cameras allow you to store 
images in RAW format. RAW format is not really an image standard at all. It is 
different for every make of camera. RAW format images contain all the data that 
is taken directly from the camera's image sensor before the software in the 
camera applies things like white balance, sharpening &etc; Storing  photographs 
in a camera's RAW format allows you to alter settings, such as white balance, 
after the photograph has been taken. Most professional photographers use RAW 
format, because it offers them maximum flexibility. The downside is that RAW 
image files can be very large indeed.
-                </para>
+            <para>
+            Some, typically more expensive, cameras allow you to store images 
in RAW format. RAW format is not really an image standard at all. It is 
different for every make of camera. RAW format images contain all the data that 
is taken directly from the camera's image sensor before the software in the 
camera applies things like white balance, sharpening &etc; Storing  photographs 
in a camera's RAW format allows you to alter settings, such as white balance, 
after the photograph has been taken. Most professional photographers use RAW 
format, because it offers them maximum flexibility. The downside is that RAW 
image files can be very large indeed.
+            </para>
 
-                <para>
-                If you want to learn more about RAW image format visit the 
very helpful guides<ulink url="http://en.wikipedia.org/wiki/RAW_image_format";> 
Wikipedia,</ulink> <ulink 
url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml";>
 The Luminous Landscape,</ulink> and <ulink 
url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm";> Cambridge 
in Colour</ulink>. You can convert RAW format images into JPEG or TIFF in 
&digikam; using the <ulink url="help:/kipi-plugins/rawconverter.html">RAW Image 
Converter plugin</ulink>. See the <link 
linkend="using-setup">Configuration</link> section for information about using 
plugins with &digikam;.
-                </para>
+            <para>
+            If you want to learn more about RAW image format visit the very 
helpful guides<ulink url="http://en.wikipedia.org/wiki/RAW_image_format";> 
Wikipedia,</ulink> <ulink 
url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml";>
 The Luminous Landscape,</ulink> and <ulink 
url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm";> Cambridge 
in Colour</ulink>. You can convert RAW format images into JPEG, PNG, or TIFF in 
&digikam; using the <link linkend="bqm-rawworkflow">Batch Queue Manager</link>.
+            </para>
 
-                <para>
-                    &digikam; supports RAW image loading only; relying on the 
<ulink url="http://www.libraw.org";>Libraw library</ulink> which is included in 
&digikam; core and supports over 800 RAW file formats. All supported cameras 
are listed at the bottom of <ulink 
url="http://www.cybercom.net/~dcoffin/dcraw";> Dave Coffin's</ulink> web page. 
The table below shows a short list of camera RAW files supported by &digikam;:
+            <para>
+                &digikam; supports RAW image loading only; relying on the 
<ulink url="http://www.libraw.org";>Libraw library</ulink> which is included in 
&digikam; core and supports over 800 RAW file formats. All supported cameras 
are listed at the bottom of <ulink 
url="http://www.cybercom.net/~dcoffin/dcraw";> Dave Coffin's</ulink> web page. 
The table below shows a short list of camera RAW files supported by &digikam;:
 
-                <informaltable><tgroup cols="2">
+            <informaltable><tgroup cols="2">
 
-                    <thead><row>
-                    <entry>RAW File Format</entry>
-                    <entry>Description</entry>
-                    </row></thead>
-                    <tbody>
-                        <row><entry>
-                        CRW, CR2
-                        </entry><entry>
-                        Canon digital camera RAW file formats
-                        </entry></row>
+                <thead><row>
+                <entry>RAW File Format</entry>
+                <entry>Description</entry>
+                </row></thead>
+                <tbody>
+                    <row><entry>
+                    CRW, CR2
+                    </entry><entry>
+                    Canon digital camera RAW file formats
+                    </entry></row>
 
-                        <!-- ************************ -->
-                        <row><entry>
-                        NEF
-                        </entry><entry>
-                        Nikon digital camera RAW file format
-                        </entry></row>
+                    <!-- ************************ -->
+                    <row><entry>
+                    NEF
+                    </entry><entry>
+                    Nikon digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        ORF
-                        </entry><entry>
-                        Olympus digital camera RAW file format
-                        </entry></row>
-
-                        <!-- ************************ -->
-
-                        <row><entry>
-                        RAF
-                        </entry><entry>
-                        Fuji digital camera RAW file format
-                        </entry></row>
-
-                        <!-- ************************ -->
-
-                        <row><entry>
-                        RWL
-                        </entry><entry>
-                        Leica camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    ORF
+                    </entry><entry>
+                    Olympus digital camera RAW file format
+                    </entry></row>
+
+                    <!-- ************************ -->
+
+                    <row><entry>
+                    RAF
+                    </entry><entry>
+                    Fuji digital camera RAW file format
+                    </entry></row>
+
+                    <!-- ************************ -->
+
+                    <row><entry>
+                    RWL
+                    </entry><entry>
+                    Leica camera RAW file format
+                    </entry></row>
 
-                         <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        PEF, PTX
-                        </entry><entry>
-                        Pentax digital camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    PEF, PTX
+                    </entry><entry>
+                    Pentax digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        X3F
-                        </entry><entry>
-                        Sigma digital camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    X3F
+                    </entry><entry>
+                    Sigma digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        DCR, KDC, DC2, K25
-                        </entry><entry>
-                        Kodak digital camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    DCR, KDC, DC2, K25
+                    </entry><entry>
+                    Kodak digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        SRF, ARW, MRW, MDC
-                        </entry><entry>
-                        Sony/Minolta digital camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    SRF, ARW, MRW, MDC
+                    </entry><entry>
+                    Sony/Minolta digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        RAW
-                        </entry><entry>
-                        Panasonic, Casio, Leica digital camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    RAW
+                    </entry><entry>
+                    Panasonic, Casio, Leica digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        DNG (CS1, HDR)
-                        </entry><entry>
-                        Adobe RAW file format (Digital Negative)
-                        </entry></row>
+                    <row><entry>
+                    DNG (CS1, HDR)
+                    </entry><entry>
+                    Adobe RAW file format (Digital Negative)
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        BAY
-                        </entry><entry>
-                        Casio RAW (Bayer)
-                        </entry></row>
+                    <row><entry>
+                    BAY
+                    </entry><entry>
+                    Casio RAW (Bayer)
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        ERF
-                        </entry><entry>
-                        Epson digital camera RAW file format
-                        </entry></row>
+                    <row><entry>
+                    ERF
+                    </entry><entry>
+                    Epson digital camera RAW file format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        FFF
-                        </entry><entry>
-                        Imacon/Hasselblad RAW format
-                        </entry></row>
+                    <row><entry>
+                    FFF
+                    </entry><entry>
+                    Imacon/Hasselblad RAW format
+                    </entry></row>
 
-                        <!-- ************************ -->
+                    <!-- ************************ -->
 
-                        <row><entry>
-                        MOS
-                        </entry><entry>
-                        CREO Photo RAW
-                        </entry></row>
+                    <row><entry>
+                    MOS
+                    </entry><entry>
+                    CREO Photo RAW
+                    </entry></row>
 
-                        <!-- ************************ -->
-                        <row><entry>
-                        PXN
-                        </entry><entry>
-                        Fotoman RAW
-                        </entry></row>
+                    <!-- ************************ -->
+                    <row><entry>
+                    PXN
+                    </entry><entry>
+                    Fotoman RAW
+                    </entry></row>
 
-                        <!-- ************************ -->
-                        <row><entry>
-                        RDC
-                        </entry><entry>
-                        Ricoh RAW format
-                        </entry></row>
+                    <!-- ************************ -->
+                    <row><entry>
+                    RDC
+                    </entry><entry>
+                    Ricoh RAW format
+                    </entry></row>
 
 
-                    </tbody>
+                </tbody>
 
-                </tgroup></informaltable>
+            </tgroup></informaltable>
 
-                </para>
+            </para>
 
-            </sect3>
+        </sect3>
 
-        </sect2>
+    </sect2>
 
-        <sect2>        <title>Moving Image Formats (Videos)</title>
+    <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 desktop 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 MP4 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; you can 
preview video or choose a viewing application throuh your desktop settings.
         </para>
-        </sect2>
-
-    </sect1>
+    
+    </sect2>
+
+</sect1>
+ 
+<!--
+Local Variables:
+mode: sgml
+sgml-omittag: nil
+sgml-shorttag: t
+End:
+-->
diff --git a/digikam/introductionfirewireconnector.png 
b/digikam/intro-firewireconnector.png
similarity index 100%
rename from digikam/introductionfirewireconnector.png
rename to digikam/intro-firewireconnector.png
diff --git a/digikam/intro-firstrun.docbook b/digikam/intro-firstrun.docbook
index 4adcd74..e353299 100644
--- a/digikam/intro-firstrun.docbook
+++ b/digikam/intro-firstrun.docbook
@@ -1,123 +1,149 @@
-<sect1 id="intro-firstrun">   <title>Getting Started</title>
+<sect1 id="intro-firstrun"> <title>Getting Started</title>
 
-    <sect2>   <title></title>
-    <para></para>
-    <sect3 id="firstrundialog">   <title>The First Run Dialog</title>
+    <sect2> <title></title>
         <para>
-        <!-- <imagedata fileref="&path;introductionfirstrundialog.png" 
format="PNG" />  -->
-        <inlinemediaobject><imageobject>
-            <imagedata fileref="&path;intro-firstrun-step1.png" format="PNG" 
/></imageobject>
-        </inlinemediaobject>
         </para>
+    
+        <sect3 id="firstrundialog"> <title>The First Run Dialog</title>
+
+            <para>
+                <!-- <imagedata fileref="&path;intro-firstrundialog.png" 
format="PNG" />  -->
+                <inlinemediaobject><imageobject>
+                    <imagedata fileref="&path;intro-firstrun-step1.png" 
format="PNG" /></imageobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                When you start &digikam; for the very first time it will ask 
you where you store your photographs. You can choose any local, remote or 
removable folder. Just type in the path name of a folder or click on the 
<guilabel>Browse...</guilabel> icon to select a folder from the dialog.
+            </para>
+
+            <para>
+                Later on you can add as many locations as you like - &digikam; 
will add them to the album library. 
<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure 
digiKam</guimenuitem><guimenuitem>Collections</guimenuitem></menuchoice>
+            </para>
+
+            <para>
+                <inlinemediaobject><imageobject>
+                    <imagedata fileref="&path;intro-firstrun-step2.png" 
format="PNG" /></imageobject>
+                    <textobject> <phrase>Choosing database path for 
digikam</phrase> </textobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                Then you have to specify a local folder that resides on your 
computer, in which the database will be stored. This path will be the same for 
all image folders.
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                    <imageobject><imagedata 
fileref="&path;intro-firstrun-step3.png" format="PNG" /></imageobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                Next, you will have to choose the way you would like to open 
RAW files : either with automatic adjustments or with the digiKam RAW import 
tool to adjust corrections manually.
+            </para>
+
+            <para>
+                If you don't know what is a RAW file or if your camera don't 
support RAW files, you should keep the default setting and skip this step.
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;intro-firstrun-step4.png" format="PNG"/></imageobject>
+                <textobject> <phrase>RAW import</phrase> </textobject>
+                </inlinemediaobject>
+            </para> 
+
+            <para>
+                Metadata information storage may be important if you plan to 
work with another photo management program and you should choose <guilabel>Add 
information to files</guilabel>. But if you don't want to alter your pictures, 
keep the default setting: <guilabel>Do nothing</guilabel>.
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;intro-firstrun-step5.png" format="PNG"/></imageobject>
+                <textobject> <phrase>Metadata information</phrase> 
</textobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                Then choose how digiKam will load images in preview mode and 
light table. Reduced version will load faster but at the cost of quality.
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;intro-firstrun-step6.png" format="PNG"/></imageobject>
+                <textobject> <phrase>Preview image method</phrase> 
</textobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                Now decide how digiKam will open images on a right click. 
Previews will load faster but you won't be able to make any corrections.
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;intro-firstrun-step7.png" format="PNG"/></imageobject>
+                <textobject> <phrase>Open image method</phrase> </textobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                Tooltips are a fast and easy way to display important 
information about a photograph, they popup as the mouse moves over a thumbnail. 
Select "Use tooltips" if you want to display them.
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;intro-firstrun-step8.png" format="PNG"/></imageobject>
+                <textobject> <phrase>Tooltips</phrase> </textobject>
+                </inlinemediaobject>
+            </para>
+
+            <para>
+                Click on <guibutton>Finish</guibutton>. DigiKam will now start 
to scan for photographs...
+            </para>
+
+            <para>
+                <inlinemediaobject>
+                <imageobject><imagedata 
fileref="&path;intro-firstrun-step9.png" format="PNG"/></imageobject>
+                <textobject> <phrase>Tooltips</phrase> </textobject>
+                </inlinemediaobject>
+            </para>
+
+        </sect3>
+
+        <sect3> <title>The Scan Items Dialog</title>
+            <para>
+                If you already have a collection of photographs on your hard 
disk, you can enter the top-level folder containing the photographs, this is 
called the Albums Library folder. &digikam; will treat each sub-folder of the 
folder you've entered as an Album. None of the photographs will be altered. 
During folders parsing you can see a progress bar in the lower right corner 
like this:
+            </para>
+            
+            <para>
+                <inlinemediaobject> <imageobject>
+                <imagedata fileref="&path;intro-scanprogress.png" format="PNG" 
/> </imageobject></inlinemediaobject>
+            </para>
+            
+            <note>
+                <para>
+                    &digikam; will recurse the library path to its full depth. 
You cannot exclude (prune) any sub-path unless you make that sub-path hidden. 
You have to do that from outside of &digikam; by putting a dot in front of the 
sub-path.
+                </para>
+            </note>
+
+            <para>
+                As &digikam; uses your folders on your hard disk directly, 
other applications like file managers can remove any albums outside a &digikam; 
session. In this case &digikam; will tell you at the next session if all albums 
that have been removed from the &digikam; photographs root path shall be 
deleted from albums database. If you want to move folders around and do not 
want to do that in &digikam;, we suggest you do that while &digikam; is 
running, so the database will be kept in sync and you do not lose any metadata.
+            </para>
+
+            <para>
+                When you use an existing folder of photographs, as the Album 
Library folder, you will notice that the Albums in the Album list do not have 
photographs as their icons. You can change that by dragging any photograph in 
the Album onto the folder icon in the left sidebar and use this as the Album 
icon. See the <link linkend="using-myalbumsview">Album</link> section for 
details of how to change the Album icon.
+            </para>
+
+            <para>
+                &digikam; use a dedicated database to store thumbnails with an 
optimized wavelets compression algorithm (PGF)  thumbnail folders. There is no 
way of hiding non-standard thumbnail folders from the &quot;Albums&quot; list. 
If you want to keep them you could create an Album Collection that just 
contains all the thumbnail Folders and then view your Albums in By Collection 
order. See the <link linkend="using-myalbumsview">Album</link> section for more 
about Album Collections.
+            </para>
+
+            <para>
+                Once you have configured the Album Library Folder you can set 
up &digikam; to work with your digital camera. Then learn how to use <link 
linkend="using-myalbumsview">Albums</link> and <link 
linkend="using-mytagsview">Tags</link> to arrange your photograph Albums.
+            </para>
+            
+        </sect3>
 
-    <para>
-        When you start &digikam; for the very first time it will ask you where 
you store your photographs. You can choose any local, remote or removable 
folder. Just type in the path name of a folder or click on the 
<guilabel>Browse...</guilabel> icon to select a folder from the dialog.
-        </para>
-
-        <para>
-        Later on you can add as many locations as you like - &digikam; will 
add them to the album library. 
<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure 
digiKam</guimenuitem><guimenuitem>Collections</guimenuitem></menuchoice>
-        </para>
-
-        <para>
-        <inlinemediaobject><imageobject>
-            <imagedata fileref="&path;intro-firstrun-step2.png" format="PNG" 
/></imageobject>
-            <textobject> <phrase>Choosing database path for digikam</phrase> 
</textobject>
-        </inlinemediaobject>
-    </para>
-
-    <para>Then you have to specify a local folder that resides on your 
computer, in which the database will be stored. This path will be the same for 
all image folders.
-    </para>
-
-    <para>
-        <inlinemediaobject>
-            <imageobject><imagedata fileref="&path;intro-firstrun-step3.png" 
format="PNG" /></imageobject>
-        </inlinemediaobject>
-    </para>
-
-    <para>Next, you will have to choose the way you would like to open RAW 
files : either with automatic adjustments or with the digiKam RAW import tool 
to adjust corrections manually.</para>
-
-    <para> If you don't know what is a RAW file or if your camera don't 
support RAW files, you should keep the default setting and skip this 
step.</para>
-
-    <para>
-        <inlinemediaobject>
-        <imageobject><imagedata fileref="&path;intro-firstrun-step4.png" 
format="PNG"/></imageobject>
-        <textobject> <phrase>RAW import</phrase> </textobject>
-        </inlinemediaobject>
-    </para> 
-
-    <para>Metadata information storage may be important if you plan to work 
with another photo management program and you should choose <guilabel>Add 
information to files</guilabel>. But if you don't want to alter your pictures, 
keep the default setting: <guilabel>Do nothing</guilabel>.</para>
-
-    <para>
-    <inlinemediaobject>
-    <imageobject><imagedata fileref="&path;intro-firstrun-step5.png" 
format="PNG"/></imageobject>
-    <textobject> <phrase>Metadata information</phrase> </textobject>
-    </inlinemediaobject>
-    </para>
-
-    <para>Then choose how digiKam will load images in preview mode and light 
table. Reduced version will load faster but at the cost of quality.</para>
-
-    <para>
-    <inlinemediaobject>
-    <imageobject><imagedata fileref="&path;intro-firstrun-step6.png" 
format="PNG"/></imageobject>
-    <textobject> <phrase>Preview image method</phrase> </textobject>
-    </inlinemediaobject>
-    </para>
-
-    <para>Now decide how digiKam will open images on a right click. Previews 
will load faster but you won't be able to make any corrections.</para>
-
-    <para>
-    <inlinemediaobject>
-    <imageobject><imagedata fileref="&path;intro-firstrun-step7.png" 
format="PNG"/></imageobject>
-    <textobject> <phrase>Open image method</phrase> </textobject>
-    </inlinemediaobject>
-    </para>
-
-    <para>Tooltips are a fast and easy way to display important information 
about a photograph, they popup as the mouse moves over a thumbnail. Select "Use 
tooltips" if you want to display them.</para>
-
-    <para>
-    <inlinemediaobject>
-    <imageobject><imagedata fileref="&path;intro-firstrun-step8.png" 
format="PNG"/></imageobject>
-    <textobject> <phrase>Tooltips</phrase> </textobject>
-    </inlinemediaobject>
-    </para>
-
-    <para>Click on <guibutton>Finish</guibutton>. DigiKam will now start to 
scan for photographs...</para>
-
-    <para>
-    <inlinemediaobject>
-    <imageobject><imagedata fileref="&path;intro-firstrun-step9.png" 
format="PNG"/></imageobject>
-    <textobject> <phrase>Tooltips</phrase> </textobject>
-    </inlinemediaobject>
-    </para>
-
-    </sect3>
-
-    <sect3> <title>The Scan Items Dialog</title>
-    <para>
-        If you already have a collection of photographs on your hard disk, you 
can enter the top-level folder containing the photographs, this is called the 
Albums Library folder. &digikam; will treat each sub-folder of the folder 
you've entered as an Album. None of the photographs will be altered. During 
folders parsing you can see a progress bar in the lower right corner like this:
-    </para>
-    <para>
-        <inlinemediaobject> <imageobject>
-        <imagedata fileref="&path;intro-scanprogress.png" format="PNG" /> 
</imageobject></inlinemediaobject>
-    </para>
-    <note><para>&digikam; will recurse the library path to its full depth. You 
cannot exclude (prune) any sub-path unless you make that sub-path hidden. You 
have to do that from outside of &digikam; by putting a dot in front of the 
sub-path.</para></note>
-
-    <para>
-        As &digikam; uses your folders on your hard disk directly, other 
applications like file managers can remove any albums outside a &digikam; 
session. In this case &digikam; will tell you at the next session if all albums 
that have been removed from the &digikam; photographs root path shall be 
deleted from albums database. If you want to move folders around and do not 
want to do that in &digikam;, we suggest you do that while &digikam; is 
running, so the database will be kept in sync and you do not lose any metadata.
-    </para>
-
-    <para>
-        When you use an existing folder of photographs, as the Album Library 
folder, you will notice that the Albums in the Album list do not have 
photographs as their icons. You can change that by dragging any photograph in 
the Album onto the folder icon in the left sidebar and use this as the Album 
icon. See the <link linkend="using-myalbumsview">Album</link> section for 
details of how to change the Album icon.
-    </para>
-
-    <para>
-        &digikam; use a dedicated database to store thumbnails with an 
optimized wavelets compression algorithm (PGF)  thumbnail folders. There is no 
way of hiding non-standard thumbnail folders from the &quot;Albums&quot; list. 
If you want to keep them you could create an Album Collection that just 
contains all the thumbnail Folders and then view your Albums in By Collection 
order. See the <link linkend="using-myalbumsview">Album</link> section for more 
about Album Collections.
-    </para>
-
-    <para>
-        Once you have configured the Album Library Folder you can set up 
&digikam; to work with your digital camera. Then learn how to use <link 
linkend="using-myalbumsview">Albums</link> and <link 
linkend="using-mytagsview">Tags</link> to arrange your photograph Albums.
-    </para>
-    </sect3>
     </sect2>
 
 </sect1>
diff --git a/digikam/introductionfirstrundialog.png 
b/digikam/intro-firstrundialog.png
similarity index 100%
rename from digikam/introductionfirstrundialog.png
rename to digikam/intro-firstrundialog.png
diff --git a/digikam/introductionplugininterfaces.png 
b/digikam/intro-plugininterface.png
similarity index 100%
rename from digikam/introductionplugininterfaces.png
rename to digikam/intro-plugininterface.png
diff --git a/digikam/intro-pluginsupport.docbook 
b/digikam/intro-pluginsupport.docbook
index 1b6e76b..5a087f8 100644
--- a/digikam/intro-pluginsupport.docbook
+++ b/digikam/intro-pluginsupport.docbook
@@ -1,19 +1,14 @@
 <sect1 id="using-pluginsupport"> <title>Supported Plugins</title>
 
     <para>
-        One of the nicest things about &digikam; is how easily its 
functionality can be extended, by using plugins:
-
-        <itemizedlist>
-
-                <listitem><para><emphasis>KIPI plugins</emphasis>: the <ulink 
url="https://quickgit.kde.org/?p=kipi-plugins.git";>Kipi project</ulink> (<ulink 
url="help:/kipi-plugins/index.html">manual</ulink>) is dedicated to develop a 
plugin interface for &digikam;. Kipi-Plugins setup is described in this <link 
linkend="setup-kipiplugins">section</link>.</para></listitem>
-
-        </itemizedlist>
+        One of the nicest things about &digikam; is how easily its 
functionality can be extended, by using <emphasis>KIPI plugins</emphasis>. The 
<ulink url="https://quickgit.kde.org/?p=kipi-plugins.git";>Kipi project</ulink> 
(<ulink url="help:/kipi-plugins/index.html">manual</ulink>) is dedicated to 
develop a plugin interface for &digikam;. Kipi-Plugins setup is described in 
this <link linkend="setup-kipiplugins">section</link>.
+    </para>
 
+    <para>
         <inlinemediaobject>
-            <imageobject><imagedata 
fileref="&path;introductionplugininterfaces.png" format="PNG"/></imageobject>
+            <imageobject><imagedata fileref="&path;intro-plugininterface.png" 
format="PNG"/></imageobject>
             <textobject> <phrase>The &digikam; plugins interface</phrase> 
</textobject>
         </inlinemediaobject>
-
     </para>
 
     <para>
@@ -21,7 +16,6 @@
     </para>
 
 </sect1>
-
  
 <!--
 Local Variables:
diff --git a/digikam/introductionserialconnector.png 
b/digikam/intro-serialconnector.png
similarity index 100%
rename from digikam/introductionserialconnector.png
rename to digikam/intro-serialconnector.png
diff --git a/digikam/introductionusbconnector.png 
b/digikam/intro-usbconnector.png
similarity index 100%
rename from digikam/introductionusbconnector.png
rename to digikam/intro-usbconnector.png
diff --git a/digikam/introductionfoldericon.png 
b/digikam/introductionfoldericon.png
deleted file mode 100644
index 12dd1d4..0000000
Binary files a/digikam/introductionfoldericon.png and /dev/null differ
diff --git a/digikam/using-bqm.docbook b/digikam/using-bqm.docbook
index f59415f..3d14f0f 100644
--- a/digikam/using-bqm.docbook
+++ b/digikam/using-bqm.docbook
@@ -9,7 +9,7 @@
 
     </sect2>
 
-    <sect2> <title>Batch RAW Workflow</title>
+    <sect2 id="bqm-rawworkflow"> <title>Batch RAW Workflow</title>
 
         <sect3><title>Introduction to Raw Converter</title>
 

Reply via email to