Git commit 4e9943424fe832027770f2f4b00bbe904ab6c486 by Gilles Caulier. Committed on 02/09/2016 at 14:38. Pushed by cgilles into branch 'master'.
share Using Setup intro section between DK and Showfoto M +1 -1 TODO M +5 -79 digikam/using-setup-intro.docbook M +6 -10 showfoto/index.docbook http://commits.kde.org/digikam-doc/4e9943424fe832027770f2f4b00bbe904ab6c486 diff --git a/TODO b/TODO index 1a1f102..5af953a 100644 --- a/TODO +++ b/TODO @@ -132,7 +132,7 @@ using-setup-editor-raw.docbook using-setup-mimetype.docbook using-setup-theme.docbook using-setup-cm.docbook Add sections about Profiles and Advanced tabs -using-setup-intro.docbook +using-setup-intro.docbook DONE DONE Gilles using-setup-misc.docbook using-setup-misc-behavior.docbook using-setup-tooltip.docbook DONE DONE Gilles diff --git a/digikam/using-setup-intro.docbook b/digikam/using-setup-intro.docbook index 02b93ee..50bdf51 100644 --- a/digikam/using-setup-intro.docbook +++ b/digikam/using-setup-intro.docbook @@ -4,87 +4,13 @@ <anchor id="setupdialog.anchor"/> <para> - &digikam; tries to give you as much control over how it works as possible. There are many options that change the behavior of &digikam;. To access these settings select - <menuchoice><guimenu>Settings</guimenu> - <guimenuitem>Configure &digikam;</guimenuitem></menuchoice> from the menubar. The configuration dialog is separated by categories displayed in separated pages. You can change between these pages by clicking on the icons on the left-hand side of the dialog. + &digikam; tries to give you as much control over how it works as possible. + There are many options that change the behavior of the application. To access these settings select + <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;</guimenuitem></menuchoice> + from the menubar. The configuration dialog is separated by categories displayed in separated pages. + You can change between these pages by clicking on the icons on the left-hand side of the dialog. </para> - <itemizedlist> - - <listitem><para> - <link linkend="using-setup-database">Database Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-collections">Collections Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-album">Album Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-tooltip">Tooltip Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-metadata">Metadata Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-templates">Templates Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-mimetype">Mime-Type Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-editor-iface">Image Editor Window Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-editor-version">Image Editor Versioning Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-editor-save">Image Editor Saving Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-raw">RAW Decoding Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-cm">Color Management Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-lighttable">Light Table Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-slideshow">Slide show settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-quality">Image Quality Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-camera">Camera Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-plugins">Plugins Settings</link> - </para></listitem> - - <listitem><para> - <link linkend="using-setup-misc">Miscellaneous Settings</link> - </para></listitem> - - </itemizedlist> - </sect2> <!-- diff --git a/showfoto/index.docbook b/showfoto/index.docbook index 337df76..607b25e 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -23,10 +23,10 @@ <!ENTITY doc-using-sidebar-filters SYSTEM "../digikam/using-sidebar-filters.docbook"> <!ENTITY doc-using-sidebar-tools SYSTEM "../digikam/using-sidebar-tools.docbook"> + <!ENTITY doc-using-setup-intro SYSTEM "../digikam/using-setup-intro.docbook"> <!ENTITY doc-using-setup-metadata-intro SYSTEM "../digikam/using-setup-metadata-intro.docbook"> <!ENTITY doc-using-setup-metadata-rotation-ac SYSTEM "../digikam/using-setup-metadata-rotation-ac.docbook"> <!ENTITY doc-using-setup-metadata-views SYSTEM "../digikam/using-setup-metadata-views.docbook"> - <!ENTITY doc-using-setup-editor-iface SYSTEM "../digikam/using-setup-editor-iface.docbook"> <!ENTITY doc-using-setup-editor-save SYSTEM "../digikam/using-setup-editor-save.docbook"> <!ENTITY doc-using-setup-editor-raw SYSTEM "../digikam/using-setup-editor-raw.docbook"> @@ -180,27 +180,23 @@ </chapter> - <chapter id="using-showfoto-sidebar"> <title>The &showfoto; sidebar</title> + <chapter id="using-showfoto-sidebar"> + <title>The &showfoto; sidebar</title> &doc-using-sidebar; </chapter> - <chapter id="using-showfoto"> <title>Using &showfoto;</title> + <chapter id="using-showfoto"> + <title>Using &showfoto;</title> &doc-editor-photoediting; &doc-editor-cm; <sect1 id="using-setup"> <title>&showfoto; Configuration</title> - <anchor id="setupdialog.anchor"/> - - <para> - &showfoto; tries to give you as much control on how it works as possible. There are many options that change the behavior of &showfoto;. To access these settings select - <menuchoice><guimenu>Setting</guimenu> - <guimenuitem>Configure &showfoto;</guimenuitem></menuchoice> from the Menu Bar. The configuration dialog is separated into eight pages. You can change between these pages by clicking on the icons on the left-hand side of the dialog. - </para> + &doc-using-setup-intro; &doc-using-setup-tooltip; <sect2 id="using-setup-metadata">
