Git commit 1d2e8c8c354669a237d6a5f858c0c1eb89f71c20 by Yuri Chornoivan. Committed on 04/10/2016 at 17:26. Pushed by yurchor into branch 'master'.
Incorporate digikam's info-intro docbook as it cannot be translated otherwise (it has no top level tag) M +14 -2 digikam/index.docbook D +0 -25 digikam/intro-info.docbook M +14 -2 showfoto/index.docbook http://commits.kde.org/digikam-doc/1d2e8c8c354669a237d6a5f858c0c1eb89f71c20 diff --git a/digikam/index.docbook b/digikam/index.docbook index 8e28728..4414157 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -10,7 +10,6 @@ <!-- Introduction Chapter --> - <!ENTITY doc-intro-info SYSTEM "intro-info.docbook"> <!ENTITY doc-intro-background SYSTEM "intro-background.docbook"> <!ENTITY doc-intro-contrib SYSTEM "intro-contrib.docbook"> <!ENTITY doc-intro-firstrun SYSTEM "intro-firstrun.docbook"> @@ -205,7 +204,20 @@ <bookinfo> - &doc-intro-info; + <title>The &digikam; Handbook</title> + <copyright> + <year>2001</year> + <year>2016</year> + <holder>The <ulink url="http://www.digikam.org">digiKam</ulink> developers team</holder> + </copyright> + +<!-- Translators: put here the copyright notice of the translation --> +<!-- Put here the FDL notice. Read the explanation in fdl-notice.docbook + and in the FDL itself on how to use it. --> + <legalnotice>&FDLNotice;</legalnotice> + + <date>Summer 2016</date> + <releaseinfo>5.0</releaseinfo> <abstract> diff --git a/digikam/intro-info.docbook b/digikam/intro-info.docbook deleted file mode 100644 index b4062f4..0000000 --- a/digikam/intro-info.docbook +++ /dev/null @@ -1,25 +0,0 @@ -<title>The &digikam; Handbook</title> - -<copyright> - <year>2001</year> - <year>2016</year> - <holder>The <ulink url="http://www.digikam.org">digiKam</ulink> developers team</holder> -</copyright> - -<!-- Translators: put here the copyright notice of the translation --> -<!-- Put here the FDL notice. Read the explanation in fdl-notice.docbook - and in the FDL itself on how to use it. --> -<legalnotice>&FDLNotice;</legalnotice> - -<date>Summer 2016</date> -<releaseinfo>5.0</releaseinfo> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: ---> diff --git a/showfoto/index.docbook b/showfoto/index.docbook index 6df6294..5046d59 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -10,7 +10,6 @@ <!ENTITY digikam-app '<application>digiKam</application>'> <!ENTITY path "../digikam/"><!-- relative path to snapshots for showfoto --> - <!ENTITY doc-intro-info SYSTEM "../digikam/intro-info.docbook"> <!ENTITY doc-intro-contrib SYSTEM "../digikam/intro-contrib.docbook"> <!ENTITY doc-intro-imageformats SYSTEM "../digikam/intro-imageformats.docbook"> @@ -114,7 +113,20 @@ <bookinfo> - &doc-intro-info; + <title>The &digikam; Handbook</title> + <copyright> + <year>2001</year> + <year>2016</year> + <holder>The <ulink url="http://www.digikam.org">digiKam</ulink> developers team</holder> + </copyright> + +<!-- Translators: put here the copyright notice of the translation --> +<!-- Put here the FDL notice. Read the explanation in fdl-notice.docbook + and in the FDL itself on how to use it. --> + <legalnotice>&FDLNotice;</legalnotice> + + <date>Summer 2016</date> + <releaseinfo>5.0</releaseinfo> <keywordset> <keyword>digikam</keyword>
