Hello community,
here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2015-09-02 07:45:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdoctools (Old)
and /work/SRC/openSUSE:Factory/.kdoctools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdoctools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2015-07-14 17:23:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2015-09-02 07:45:30.000000000 +0200
@@ -1,0 +2,23 @@
+Tue Aug 4 19:20:24 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.13.0
+ * The Qt version requirement has been bumped from 5.2 to 5.3
+ * Debug output has been ported to categorized output, for less
+ noise by default
+ * Docbook documentation has been reviewed and updated
+ * Change sentence about reporting bugs, ack'ed by dfaure
+ * Adapt german user.entities to en/user.entities
+ * Update general.entities: change markup for frameworks + plasma
+ from application to productname
+ * Update en/user.entities
+ * Update book and man page templates
+ * Use CMAKE_MODULE_PATH in cmake_install.cmake
+ * Update general.entities
+ * Search for required perl modules.
+ * Namespace a helper macro in the installed macros file.
+ * Adapted key name tranlations to standard tranlations provided
+ by Termcat
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.13.0.php
+
+-------------------------------------------------------------------
Old:
----
kdoctools-5.12.0.tar.xz
New:
----
kdoctools-5.13.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdoctools.spec ++++++
--- /var/tmp/diff_new_pack.OQXzKg/_old 2015-09-02 07:45:31.000000000 +0200
+++ /var/tmp/diff_new_pack.OQXzKg/_new 2015-09-02 07:45:31.000000000 +0200
@@ -17,9 +17,9 @@
%bcond_without lang
-%define _tar_path 5.12
+%define _tar_path 5.13
Name: kdoctools
-Version: 5.12.0
+Version: 5.13.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -33,7 +33,7 @@
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: perl-URI
-BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
+BuildRequires: cmake(Qt5Core) >= 5.3.0
%if %{with lang}
Recommends: %{name}-lang = %{version}
%endif
@@ -54,7 +54,7 @@
Requires: docbook-xsl-stylesheets
Requires: extra-cmake-modules >= 1.8.0
Requires: libxslt-devel
-Requires: pkgconfig(Qt5Core) >= 5.2.0
+Requires: cmake(Qt5Core) >= 5.3.0
Provides: %{name}-devel-static = %{version}
%description devel
++++++ kdoctools-5.12.0.tar.xz -> kdoctools-5.13.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/CMakeLists.txt new/kdoctools-5.13.0/CMakeLists.txt
--- old/kdoctools-5.12.0/CMakeLists.txt 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/CMakeLists.txt 2015-08-04 12:55:51.000000000 +0200
@@ -4,7 +4,7 @@
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.12.0 NO_MODULE)
+find_package(ECM 5.13.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -15,15 +15,15 @@
include(ECMMarkNonGuiExecutable)
include(ECMPackageConfigHelpers)
-set(KF5_VERSION "5.12.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.12.0") # handled by release scripts
+set(KF5_VERSION "5.13.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.13.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDOCTOOLS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdoctools_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfigVersion.cmake"
SOVERSION 5)
# Dependencies
-set(REQUIRED_QT_VERSION 5.2.0)
+set(REQUIRED_QT_VERSION 5.3.0)
find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/KF5DocToolsMacros.cmake new/kdoctools-5.13.0/KF5DocToolsMacros.cmake
--- old/kdoctools-5.12.0/KF5DocToolsMacros.cmake 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/KF5DocToolsMacros.cmake 2015-08-04 12:55:51.000000000 +0200
@@ -89,7 +89,7 @@
set(KDOCTOOLS_MEINPROC_EXECUTABLE ${KDOCTOOLS_SERIALIZE_TOOL} ${KDOCTOOLS_MEINPROC_EXECUTABLE})
endif(KDOCTOOLS_SERIALIZE_TOOL)
-function(create_target_name out in)
+function(_kdoctools_create_target_name out in)
string(REGEX REPLACE "^${CMAKE_BINARY_DIR}/?" "" in "${in}")
string(REGEX REPLACE "[^0-9a-zA-Z]+" "-" tmp "${in}")
set(${out} ${tmp} PARENT_SCOPE)
@@ -139,7 +139,7 @@
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
- create_target_name(_targ ${build_doc})
+ _kdoctools_create_target_name(_targ ${build_doc})
add_custom_target(${_targ} ALL DEPENDS ${build_doc})
if(KDOCTOOLS_ENABLE_HTMLHANDBOOK)
@@ -196,7 +196,7 @@
WORKING_DIRECTORY ${build_dir}
)
- create_target_name(_targ ${build_doc})
+ _kdoctools_create_target_name(_targ ${build_doc})
add_custom_target(${_targ} ALL DEPENDS "${build_doc}")
if(ARGS_INSTALL_DESTINATION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/cmake/FindPerlModules.cmake new/kdoctools-5.13.0/cmake/FindPerlModules.cmake
--- old/kdoctools-5.12.0/cmake/FindPerlModules.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kdoctools-5.13.0/cmake/FindPerlModules.cmake 2015-08-04 12:55:51.000000000 +0200
@@ -0,0 +1,89 @@
+#.rst:
+# FindPerlModules
+# ---------------
+#
+# Check that Perl has certain modules available.
+#
+# If PERL_EXECUTABLE is set, uses that, otherwise calls the Perl find module.
+#
+# To use, pass the perl module names (in the form you would use in a Perl
+# ``use`` statement) as components.
+#
+# This will define the following variables:
+#
+# ``Perl_<module>_FOUND``
+# True if the given Perl module could be loaded by Perl
+#
+# where ``<module>`` is either the name passed as a component, or a version
+# with ``::`` replaced by ``_``.
+
+# Copyright 2015 Alex Merry <refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/de/docs/kf5options/man-kf5options.7.docbook new/kdoctools-5.13.0/po/de/docs/kf5options/man-kf5options.7.docbook
--- old/kdoctools-5.12.0/po/de/docs/kf5options/man-kf5options.7.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/de/docs/kf5options/man-kf5options.7.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,13 +6,15 @@
<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/de/docs/meinproc5/man-meinproc5.8.docbook new/kdoctools-5.13.0/po/de/docs/meinproc5/man-meinproc5.8.docbook
--- old/kdoctools-5.12.0/po/de/docs/meinproc5/man-meinproc5.8.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/de/docs/meinproc5/man-meinproc5.8.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -4,11 +4,11 @@ <!-- change language only here -->
]> -<refentry>
+<refentry lang="&language;">
<refentryinfo>
Fehler</title>
</refentry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/de/docs/qt5options/man-qt5options.7.docbook new/kdoctools-5.13.0/po/de/docs/qt5options/man-qt5options.7.docbook
--- old/kdoctools-5.12.0/po/de/docs/qt5options/man-qt5options.7.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/de/docs/qt5options/man-qt5options.7.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,13 +6,15 @@
<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/nl/docs/checkXML5/man-checkXML5.1.docbook new/kdoctools-5.13.0/po/nl/docs/checkXML5/man-checkXML5.1.docbook
--- old/kdoctools-5.12.0/po/nl/docs/checkXML5/man-checkXML5.1.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/nl/docs/checkXML5/man-checkXML5.1.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,7 +6,7 @@
<refentry lang="&language;">
<refentryinfo>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/nl/docs/kf5options/man-kf5options.7.docbook new/kdoctools-5.13.0/po/nl/docs/kf5options/man-kf5options.7.docbook
--- old/kdoctools-5.12.0/po/nl/docs/kf5options/man-kf5options.7.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/nl/docs/kf5options/man-kf5options.7.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,13 +6,15 @@
<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/nl/docs/meinproc5/man-meinproc5.8.docbook new/kdoctools-5.13.0/po/nl/docs/meinproc5/man-meinproc5.8.docbook
--- old/kdoctools-5.12.0/po/nl/docs/meinproc5/man-meinproc5.8.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/nl/docs/meinproc5/man-meinproc5.8.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -4,11 +4,11 @@ <!-- change language only here -->
]> -<refentry>
+<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/sv/docs/checkXML5/man-checkXML5.1.docbook new/kdoctools-5.13.0/po/sv/docs/checkXML5/man-checkXML5.1.docbook
--- old/kdoctools-5.12.0/po/sv/docs/checkXML5/man-checkXML5.1.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/sv/docs/checkXML5/man-checkXML5.1.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,7 +6,7 @@
<refentry lang="&language;">
<refentryinfo>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/sv/docs/kf5options/man-kf5options.7.docbook new/kdoctools-5.13.0/po/sv/docs/kf5options/man-kf5options.7.docbook
--- old/kdoctools-5.12.0/po/sv/docs/kf5options/man-kf5options.7.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/sv/docs/kf5options/man-kf5options.7.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,13 +6,15 @@
<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/sv/docs/meinproc5/man-meinproc5.8.docbook new/kdoctools-5.13.0/po/sv/docs/meinproc5/man-meinproc5.8.docbook
--- old/kdoctools-5.12.0/po/sv/docs/meinproc5/man-meinproc5.8.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/sv/docs/meinproc5/man-meinproc5.8.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -4,11 +4,11 @@ <!-- change language only here -->
]> -<refentry>
+<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/uk/docs/checkXML5/man-checkXML5.1.docbook new/kdoctools-5.13.0/po/uk/docs/checkXML5/man-checkXML5.1.docbook
--- old/kdoctools-5.12.0/po/uk/docs/checkXML5/man-checkXML5.1.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/uk/docs/checkXML5/man-checkXML5.1.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,7 +6,7 @@
<refentry lang="&language;">
<refentryinfo>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/uk/docs/kf5options/man-kf5options.7.docbook new/kdoctools-5.13.0/po/uk/docs/kf5options/man-kf5options.7.docbook
--- old/kdoctools-5.12.0/po/uk/docs/kf5options/man-kf5options.7.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/uk/docs/kf5options/man-kf5options.7.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -6,13 +6,15 @@
<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/po/uk/docs/meinproc5/man-meinproc5.8.docbook new/kdoctools-5.13.0/po/uk/docs/meinproc5/man-meinproc5.8.docbook
--- old/kdoctools-5.12.0/po/uk/docs/meinproc5/man-meinproc5.8.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/po/uk/docs/meinproc5/man-meinproc5.8.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -4,11 +4,11 @@ <!-- change language only here -->
]> -<refentry>
+<refentry lang="&language;">
<refentryinfo>
&Lauri.Watts; &Lauri.Watts.mail;</author>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/CMakeLists.txt new/kdoctools-5.13.0/src/CMakeLists.txt
--- old/kdoctools-5.12.0/src/CMakeLists.txt 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/CMakeLists.txt 2015-08-04 12:55:51.000000000 +0200
@@ -17,6 +17,7 @@
install(CODE
"file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_DTD_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\")
include(${CMAKE_SOURCE_DIR}/cmake/uriencode.cmake)
+ set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
kdoctools_encode_uri(DocBookXML4_DTD_DIR)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install)"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/customization/ca/user.entities new/kdoctools-5.13.0/src/customization/ca/user.entities
--- old/kdoctools-5.12.0/src/customization/ca/user.entities 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/customization/ca/user.entities 2015-08-04 12:55:51.000000000 +0200
@@ -24,7 +24,7 @@
<!ENTITY kf5 "<acronym>KF5</acronym>">
<!ENTITY kf5-full "&kde-frameworks; <productnumber>5</productnumber>">
<!ENTITY kmenu "Menú <guimenu>K</guimenu>">
-<!ENTITY Maj "<keycap>Majús.</keycap>"><!-- English: &Shift; -->
+<!ENTITY Maj "<keycap>Maj</keycap>"><!-- English: &Shift; -->
<!ENTITY partman "<application>Gestor de particions del KDE</application>"> <!-- English: &partman; (KDE Partition Manager)-->
<!ENTITY plasma-active "<productname>Plasma Active del &kde;</productname>"> <!-- English: &kde; Plasma Active -->
<!ENTITY plasma-media-center "<productname>Centre multimèdia del Plasma pel &kde;</productname>"> <!-- English: &kde; Plasma Media Center -->
@@ -38,7 +38,7 @@
<!ENTITY safatasistema "<application>safata del sistema</application>"><!-- English: &systemtray; -->
<!ENTITY SO "sistema operatiu"><!-- English: &OS; -->
<!ENTITY systemsettings "<application>Arranjament del sistema</application>"> <!-- English: &systemsettings; -->
-<!ENTITY Tab "<keycap>Tabulador</keycap>">
+<!ENTITY Tab "<keycap>Tab</keycap>">
<!-- ROLES OF TRANSLATORS -->
<!ENTITY traductor.Antoni.Bella '<othercredit role="translator"><firstname>Antoni</firstname><surname>Bella</surname><affiliation><address><email>antonibella5@yahoo.com</email></address></affiliation><contrib>Traductor</contrib></othercredit>'>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/customization/de/user.entities new/kdoctools-5.13.0/src/customization/de/user.entities
--- old/kdoctools-5.12.0/src/customization/de/user.entities 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/customization/de/user.entities 2015-08-04 12:55:51.000000000 +0200
@@ -7,6 +7,7 @@
-->
<!ENTITY Alt "<keycap>Alt</keycap>">
+<!ENTITY applications "<productname>Anwendungen</productname>">
<!ENTITY Backspace "<keycap>Rücktaste</keycap>">
<!ENTITY cdrom '<hardware>CD-ROM-Laufwerk</hardware>'>
<!ENTITY Ctrl "<keycap>Strg</keycap>">
@@ -18,17 +19,9 @@
<!ENTITY FAQ '<acronym>FAQ</acronym>'>
<!ENTITY ie "<abbrev>d. h.</abbrev>">
<!ENTITY infocenter "<application>Infozentrum</application>">
-<!ENTITY kcc "<application>&kde;-Kontrollzentrum</application>" ><!-- kcc -->
-<!ENTITY kcontrolcenter "<application>&kde;-Kontrollzentrum</application>">
<!ENTITY kde-frameworks "<productname>&kde; Frameworks</productname>">
-<!ENTITY kde-sc "&kde; <acronym>SC</acronym>">
-<!ENTITY kde-sc-full "<productname>&kde; Software Compilation</productname>">
-<!ENTITY kf5 "<acronym>KF5</acronym>">
<!ENTITY kf5-full "&kde-frameworks; <productnumber>5</productnumber>">
-<!ENTITY kde "K-Arbeitsumgebung" ><!-- kde -->
<!ENTITY khelpcenter-de "<application>&kde;-Hilfezentrum</application>" >
-<!ENTITY kmenu "<guimenu>K</guimenu>-Menü"> <!-- kmenu -->
-<!ENTITY kwm "<application>kwm</application>">
<!ENTITY LMB "<mousebutton>linke</mousebutton> Maustaste">
<!ENTITY LMBn "<mousebutton>linken</mousebutton> Maustaste">
<!ENTITY LMBr "<mousebutton>linker</mousebutton> Maustaste">
@@ -51,3 +44,13 @@
<!ENTITY systemtray "<application>Systemabschnitt</application>">
<!ENTITY Tab "<keycap>Tab</keycap>"> <!-- Tab -->
+<!-- Deprecated, will be removed at a future time, do not use -->
+<!ENTITY kcc "<application>&kde;-Kontrollzentrum</application>" ><!-- kcc -->
+<!ENTITY kcontrolcenter "<application>&kde;-Kontrollzentrum</application>">
+<!ENTITY kde "K-Arbeitsumgebung" ><!-- kde -->
+<!ENTITY kde-sc "&kde; <acronym>SC</acronym>">
+<!ENTITY kde-sc-full "<productname>&kde; Software Compilation</productname>">
+<!ENTITY kf5 "<acronym>KF5</acronym>">
+<!ENTITY kmenu "<guimenu>K</guimenu>-Menü"> <!-- kmenu -->
+<!ENTITY kwm "<application>kwm</application>">
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/customization/en/user.entities new/kdoctools-5.13.0/src/customization/en/user.entities
--- old/kdoctools-5.12.0/src/customization/en/user.entities 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/customization/en/user.entities 2015-08-04 12:55:51.000000000 +0200
@@ -7,6 +7,7 @@
-->
<!ENTITY Alt "<keycap>Alt</keycap>">
+<!ENTITY applications "<productname>Applications</productname>">
<!ENTITY Backspace "<keycap>Backspace</keycap>">
<!ENTITY cdrom '<hardware>CD-ROM drive</hardware>'>
<!ENTITY Ctrl "<keycap>Ctrl</keycap>">
@@ -18,13 +19,8 @@
<!ENTITY FAQ '<acronym>FAQ</acronym>'>
<!ENTITY ie "<abbrev>i.e.</abbrev>">
<!ENTITY infocenter "<application>Info Center</application>">
-<!ENTITY kcontrolcenter "<application>&kde; Control Center</application>">
<!ENTITY kde-frameworks "<productname>&kde; Frameworks</productname>">
-<!ENTITY kde-sc "&kde; <acronym>SC</acronym>">
-<!ENTITY kde-sc-full "<productname>&kde; Software Compilation</productname>">
-<!ENTITY kf5 "<acronym>KF5</acronym>">
<!ENTITY kf5-full "&kde-frameworks; <productnumber>5</productnumber>">
-<!ENTITY kmenu "<guimenu>K</guimenu> menu">
<!ENTITY LMB "<mousebutton>left</mousebutton> mouse button">
<!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button">
<!ENTITY OS "operating system"><!-- <acronym>OS</acronym>-->
@@ -39,3 +35,11 @@
<!ENTITY systemsettings "<application>System Settings</application>">
<!ENTITY systemtray "<application>system tray</application>">
<!ENTITY Tab "<keycap>Tab</keycap>">
+
+<!-- Deprecated, will be removed at a future time, do not use -->
+<!ENTITY kcontrolcenter "<application>&kde; Control Center</application>">
+<!ENTITY kf5 "<acronym>KF5</acronym>">
+<!ENTITY kmenu "<guimenu>K</guimenu> menu">
+<!ENTITY kde-sc "&kde; <acronym>SC</acronym>">
+<!ENTITY kde-sc-full "<productname>&kde; Software Compilation</productname>">
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/customization/entities/contributor.entities new/kdoctools-5.13.0/src/customization/entities/contributor.entities
--- old/kdoctools-5.12.0/src/customization/entities/contributor.entities 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/customization/entities/contributor.entities 2015-08-04 12:55:51.000000000 +0200
@@ -301,7 +301,7 @@
<!ENTITY Marco.Martin.mail '<email>notmart@gmail.com</email>'>
<!ENTITY Dirk.Mueller '<personname><firstname>Dirk</firstname><surname>Müller</surname></personname>'>
<!ENTITY Mike.McBride '<personname><firstname>Mike</firstname><surname>McBride</surname></personname>'>
-<!ENTITY Mike.McBride.mail '<email>mpmcbride7@yahoo.com</email>'>
+<!ENTITY Mike.McBride.mail '<email>no mail</email>'>
<!ENTITY Robert.L.McCormick '<personname><firstname>Robert</firstname><othername>L.</othername><surname>McCormick</surname></personname>'>
<!ENTITY Robert.L.McCormick.mail '<email>c0029131@airmail.net</email>'>
<!ENTITY Thad.McGinnis '<personname><firstname>Thad</firstname><surname>McGinnis</surname></personname>'>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/customization/entities/general.entities new/kdoctools-5.13.0/src/customization/entities/general.entities
--- old/kdoctools-5.12.0/src/customization/entities/general.entities 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/customization/entities/general.entities 2015-08-04 12:55:51.000000000 +0200
@@ -105,50 +105,51 @@
<!ENTITY AIX "<trademark class='registered'>AIX</trademark>">
<!ENTITY akregator "<application>Akregator</application>">
-<!ENTITY aktion "<application>aKtion</application>">
<!ENTITY amarok "<application>Amarok</application>">
<!ENTITY amor "<application>AMOR</application>">
<!ENTITY ark "<application>Ark</application>">
-<!ENTITY arts "<application>aRts</application>">
-<!ENTITY arts-builder "<application>aRts-builder</application>">
-<!ENTITY artscontrol "<application>artscontrol</application>">
-<!ENTITY artsd "<application>artsd</application>">
-<!ENTITY artsdsp "<application>artsdsp</application>">
-<!ENTITY artsserver "<application>artsserver</application>">
-<!ENTITY artsshell "<application>artsshell</application>">
-<!ENTITY artswrapper "<application>artswrapper</application>">
<!ENTITY ATAPI "<acronym>ATAPI</acronym>">
-<!ENTITY atlantik "<application>Atlantik</application>">
<!ENTITY blinken "<application>Blinken</application>">
+<!ENTITY blogilo "<application>Blogilo</application>">
+<!ENTITY bomber "<application>Bomber</application>">
<!ENTITY bovo "<application>Bovo</application>">
<!ENTITY BSD "<trademark>BSD</trademark>">
<!ENTITY calligra "Calligra">
+<!ENTITY calligrasheets "<application>Calligra Sheets</application>">
+<!ENTITY calligrastage "<application>Calligra Stage</application>">
+<!ENTITY calligrawords "<application>Calligra Words</application>">
<!ENTITY cantor "<application>Cantor</application>">
-<!ENTITY catalogmanager "<application>Catalog Manager</application>">
<!ENTITY CD "<acronym>CD</acronym>">
<!ENTITY CDE "<acronym>CDE</acronym>">
<!ENTITY CD-ROM "<acronym>CD-ROM</acronym>">
<!ENTITY cervisia "<application>Cervisia</application>">
<!ENTITY choqok "<application>Choqok</application>">
+<!ENTITY cmake '<application>CMake</application>'>
<!ENTITY CSS "<acronym>CSS</acronym>">
<!ENTITY CUPS "<acronym>CUPS</acronym>">
<!ENTITY DBus "<acronym>D-Bus</acronym>">
+<!ENTITY DVD "<acronym>DVD</acronym>">
<!ENTITY digikam "<application>digiKam</application>">
<!ENTITY dolphin "<application>Dolphin</application>">
<!ENTITY dragon "<application>Dragon Player</application>">
<!ENTITY drkonqi "<application>DrKonqi</application>">
-<!ENTITY DCOP "<acronym>DCOP</acronym>">
<!ENTITY DVI "<acronym>DVI</acronym>">
<!ENTITY ELF "<acronym>ELF</acronym>">
<!ENTITY Emacs "<application>Emacs</application>">
<!ENTITY Flash "<trademark>Flash</trademark>">
-<!ENTITY flashkard "<application>FlashKard</application>">
+<!ENTITY filelight "<application>Filelight</application>">
+<!ENTITY firefox "<application>Firefox</application>">
<!ENTITY FTP "<acronym>FTP</acronym>">
+<!ENTITY frameworks "<productname>Frameworks</productname>">
<!ENTITY gcc "<command>gcc</command>">
+<!ENTITY gcompris "<application>GCompris</application>">
<!ENTITY GIF "<acronym>GIF</acronym>">
+<!ENTITY git '<application>Git</application>'>
<!ENTITY GMT "<acronym>GMT</acronym>">
<!ENTITY GNU "<acronym>GNU</acronym>">
+<!ENTITY granatier "<application>Granatier</application>">
<!ENTITY GUI "<acronym>GUI</acronym>">
+<!ENTITY gwenview '<application>Gwenview</application>'>
<!ENTITY Handspring "<trademark>Handspring</trademark>">
<!ENTITY Hewlett-Packard '<trademark class="registered">Hewlett-Packard</trademark>'>
<!ENTITY HotSync '<trademark class="registered">HotSync</trademark>'>
@@ -162,67 +163,55 @@
<!ENTITY Jini "<trademark>Jini</trademark>">
<!ENTITY jovie "<application>Jovie</application>">
<!ENTITY juk "<application>JuK</application>">
-<!ENTITY kaboodle "<application>Kaboodle</application>">
<!ENTITY kaddressbook "<application>KAddressBook</application>">
+<!ENTITY kajongg "<application>Kajongg</application>">
<!ENTITY kalarm "<application>KAlarm</application>">
<!ENTITY kalarmd "<application>KAlarmd</application>">
<!ENTITY kalgebra "<application>KAlgebra</application>">
<!ENTITY kalzium "<application>Kalzium</application>">
<!ENTITY kamera "<application>Kamera</application>">
<!ENTITY kanagram "<application>Kanagram</application>">
-<!ENTITY kandy "<application>Kandy</application>">
<!ENTITY kapman "<application>Kapman</application>">
<!ENTITY kappfinder "<application>Kappfinder</application>">
<!ENTITY kapptemplate "<application>KAppTemplate</application>">
-<!ENTITY kaphorism "<application>KAphorism</application>">
-<!ENTITY karbon14 "<application>Karbon14</application>">
-<!ENTITY kasteroids "<application>KAsteroids</application>">
+<!ENTITY karbon "<application>Karbon</application>">
<!ENTITY kate "<application>Kate</application>">
<!ENTITY katepart "<application>KatePart</application>">
<!ENTITY katomic "<application>KAtomic</application>">
-<!ENTITY kbabel "<application>KBabel</application>">
-<!ENTITY kbabeldict "<application>KBabelDict</application>">
+<!ENTITY kaudiocreator "<application>KAudioCreator</application>">
<!ENTITY kbackgammon "<application>KBackgammon</application>">
<!ENTITY kbattleship "<application>KBattleship</application>">
-<!ENTITY kbiff "<application>KBiff</application>">
+<!ENTITY kbibtex "<application>KBibTeX</application>">
<!ENTITY kblackbox "<application>KBlackBox</application>">
<!ENTITY kblocks "<application>KBlocks</application>">
<!ENTITY kbounce "<application>KBounce</application>">
<!ENTITY kbreakout "<application>KBreakOut</application>">
<!ENTITY kbruch "<application>KBruch</application>">
-<!ENTITY kbugbuster "<application>kbugbuster</application>">
<!ENTITY kcalc "<application>KCalc</application>">
<!ENTITY kcharselect "<application>KCharSelect</application>">
<!ENTITY kchart "<application>KChart</application>">
<!ENTITY kcontrol "<application>KControl</application>">
<!ENTITY kcron "<application>KCron</application>">
-<!ENTITY kdat "<application>KDat</application>">
-<!ENTITY kdcop "<application>kdcop</application>">
<!ENTITY kde '<orgname class="nonprofit">KDE</orgname>'>
<!ENTITY kdebugdialog "<application>KDebugDialog</application>">
+<!ENTITY kdebugdialog5 "<application>KDebugDialog</application>">
<!ENTITY kde-http '<ulink url="http://www.kde.org/">http://www.kde.org/</ulink>'>
<!ENTITY kde-ftp '<ulink url="ftp://ftp.kde.org/pub/kde/">ftp://ftp.kde.org/pub/kde/</ulink>'>
<!ENTITY kdepasswd "<application>kdepasswd</application>">
-<!ENTITY kdeprint "<application>KDEPrint</application>">
-<!ENTITY kdesktop "<application>KDesktop</application>">
<!ENTITY kdessh "<application>kdessh</application>">
<!ENTITY kdesu "<application>KDE su</application>">
+<!ENTITY kdevelop "<application>KDevelop</application>">
<!ENTITY kdiamond "<application>KDiamond</application>">
+<!ENTITY kdiff3 "<application>KDiff3</application>">
<!ENTITY kdiskfree "<application>KDiskFree</application>">
-<!ENTITY kdict "<application>KDict</application>">
-<!ENTITY kdm "<application>kdm</application>">
-<!ENTITY kdmrc "<filename>kdmrc</filename>">
-<!ENTITY kdvi "<application>KDVI</application>">
-<!ENTITY kenolaba "<application>Kenolaba</application>">
-<!ENTITY kedit "<application>KEdit</application>">
<!ENTITY keditbookmarks "<application>KEditBookmarks</application>">
-<!ENTITY keduca "<application>KEduca</application>">
<!ENTITY kexi "<application>Kexi</application>">
<!ENTITY kfax "<application>KFax</application>">
<!ENTITY kfaxview "<application>Kfaxview</application>">
<!ENTITY kfeeder "<application>KFeeder</application>">
<!ENTITY kfind "<application>KFind</application>">
<!ENTITY kfloppy "<application>Kfloppy</application>">
+<!ENTITY kfontview "<application>KFontview</application>">
<!ENTITY kformula "<application>KFormula</application>">
<!ENTITY kfouleggs "<application>KFoulEggs</application>">
<!ENTITY kfourinline "<application>KFourInLine</application>">
@@ -235,13 +224,15 @@
<!ENTITY kgoldrunner "<application>KGoldrunner</application>">
<!ENTITY kgpg "<application>KGpg</application>">
<!ENTITY kgpgcertmanager "<application>KgpgCertManager</application>">
+<!ENTITY kgraphviewer "<application>KGraphViewer</application>">
<!ENTITY khelpcenter "<application>KHelpCenter</application>">
-<!ENTITY khexedit "<application>KHexEdit</application>">
<!ENTITY kicker "<application>Kicker</application>">
<!ENTITY kickoff "<application>Kickoff</application>">
<!ENTITY kiconedit "<application>KIconEdit</application>">
<!ENTITY kig "<application>Kig</application>">
<!ENTITY kikbd "<application>kikbd</application>">
+<!ENTITY kile "<application>Kile</application>">
+<!ENTITY killbots "<application>Killbots</application>">
<!ENTITY kinfocenter "<application>KInfoCenter</application>">
<!ENTITY kiriki "<application>Kiriki</application>">
<!ENTITY kit "<application>Kit</application>">
@@ -254,12 +245,12 @@
<!ENTITY klatin "<application>KLatin</application>">
<!ENTITY kleopatra "<application>Kleopatra</application>">
<!ENTITY klettres "<application>KLettres</application>">
+<!ENTITY klickety "<application>Klickety</application>">
+<!ENTITY klipper "<application>Klipper</application>">
+<!ENTITY kollision "<application>Kollision</application>">
<!ENTITY kolorlines "<application>Kolor Lines</application>">
<!ENTITY konversation "<application>Konversation</application>">
-<!ENTITY klipper "<application>Klipper</application>">
-<!ENTITY kljettool "<application>KLjettool</application>">
-<!ENTITY klpq "<application>Klpq</application>">
-<!ENTITY klprfax "<application>Klprfax</application>">
+<!ENTITY kopete "<application>Kopete</application>">
<!ENTITY kmagnifier "<application>KMagnifier</application>">
<!ENTITY kmahjongg "<application>KMahjongg</application>">
<!ENTITY kmail "<application>KMail</application>">
@@ -279,24 +270,20 @@
<!ENTITY knetwalk "<application>KNetWalk</application>">
<!ENTITY knewsticker "<application>KNewsTicker</application>">
<!ENTITY knewstuff "<application>KNewStuff</application>">
+<!ENTITY knights "<application>Knights</application>">
<!ENTITY knode "<application>KNode</application>">
<!ENTITY knotes "<application>KNotes</application>">
-<!ENTITY kodometer "<application>KOdometer</application>">
-<!ENTITY koffice "<application>KOffice</application>">
<!ENTITY kolf "<application>Kolf</application>">
<!ENTITY kolourpaint "<application>KolourPaint</application>">
<!ENTITY kompare "<application>Kompare</application>">
-<!ENTITY koncd "<application>KOnCD</application>">
<!ENTITY konqueror "<application>Konqueror</application>">
<!ENTITY konquest "<application>Konquest</application>">
<!ENTITY konsole "<application>Konsole</application>">
+<!ENTITY konsolekalendar "<application>KonsoleKalendar</application>">
<!ENTITY kontact "<application>Kontact</application>">
<!ENTITY kooka "<application>Kooka</application>">
<!ENTITY kopete "<application>Kopete</application>">
<!ENTITY korganizer "<application>KOrganizer</application>">
-<!ENTITY korn "<application>KOrn</application>">
-<!ENTITY koshell "<application>KOShell</application>">
-<!ENTITY kotalkd "<application>KOTalkd</application>">
<!ENTITY kpackage "<application>KPackage</application>">
<!ENTITY kpager "<application>KPager</application>">
<!ENTITY kpaint "<application>KPaint</application>">
@@ -309,17 +296,15 @@
<!ENTITY kpoker "<application>KPoker</application>">
<!ENTITY kpovmodeler "<application>KPovModeler</application>">
<!ENTITY kppp "<application>KPPP</application>">
-<!ENTITY kpresenter "<application>KPresenter</application>">
-<!ENTITY kprinter "<application>kprinter</application>">
<!ENTITY krdc "<application>Remote Desktop Connection</application>">
-<!ENTITY kreatecd "<application>KreateCD</application>">
-<!ENTITY krec "<application>KRec</application>">
+<!ENTITY krecipes "<application>Krecipes</application>">
<!ENTITY kregexpeditor "<application>KRegExpEditor</application>">
<!ENTITY kreversi "<application>KReversi</application>">
<!ENTITY krfb "<application>Desktop Sharing</application>">
<!ENTITY krita "<application>Krita</application>">
<!ENTITY kruler "<application>KDE Screen Ruler</application>">
<!ENTITY krunner "<application>KRunner</application>">
+<!ENTITY krusader '<application>Krusader</application>'>
<!ENTITY ksame "<application>SameGame</application>">
<!ENTITY kscd "<application>KsCD</application>">
<!ENTITY kscreensaver "<application>KScreensaver</application>">
@@ -327,6 +312,7 @@
<!ENTITY kshisen "<application>Shisen-Sho</application>">
<!ENTITY ksim "<application>KSim</application>">
<!ENTITY ksirc "<application>KSirc</application>">
+<!ENTITY ksirk '<application>KsirK</application>'>
<!ENTITY ksirtet "<application>KSirtet</application>">
<!ENTITY ksmiletris "<application>KSmiletris</application>">
<!ENTITY ksmserver "<application>ksmserver</application>">
@@ -342,7 +328,6 @@
<!ENTITY kstart "<application>kstart</application>">
<!ENTITY ksysctrl "<application>KSysctrl</application>">
<!ENTITY ksysguard "<application>System Monitor</application>">
-<!ENTITY ksysv "<application>KSysV</application>">
<!ENTITY ksystemlog "<application>KSystemLog</application>">
<!ENTITY ktalk "<application>KTalk</application>">
<!ENTITY ktalkd "<application>KTalkd</application>">
@@ -352,18 +337,18 @@
<!ENTITY ktimer "<application>KTimer</application>">
<!ENTITY ktimetracker "<application>KTimetracker</application>">
<!ENTITY ktip "<application>KTip</application>">
+<!ENTITY ktorrent "<application>KTorrent</application>">
<!ENTITY ktouch "<application>KTouch</application>">
<!ENTITY ktron "<application>KTron</application>">
<!ENTITY ktuberling "<application>KTuberling</application>">
<!ENTITY kturtle "<application>KTurtle</application>">
-<!ENTITY kugar "<application>Kugar</application>">
-<!ENTITY kuickshow "<application>KuickShow</application>">
-<!ENTITY kuser "<application>KUser</application>">
+<!ENTITY kubrick "<application>Kubrick</application>">
<!ENTITY kubuntu "<trademark>Kubuntu</trademark>">
+<!ENTITY kuser "<application>KUser</application>">
<!ENTITY kverbos "<application>KVerbos</application>">
-<!ENTITY kview "<application>KView</application>">
-<!ENTITY kviewshell "<application>KViewshell</application>">
<!ENTITY kvoctrain "<application>KVocTrain</application>">
+<!ENTITY kwallet5 "<application>KWallet</application>">
+<!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>">
<!ENTITY kworldclock "<application>KWorldClock</application>">
<!ENTITY kword "<application>KWord</application>">
<!ENTITY kwin "<application>KWin</application>">
@@ -371,59 +356,60 @@
<!ENTITY kwrite "<application>KWrite</application>">
<!ENTITY kwuftpd "<application>kwuftpd</application>">
<!ENTITY kxkb "<application>Kxkb</application>">
+<!ENTITY kxstitch '<application>KXStitch</application>'>
<!ENTITY LaserJet '<trademark class="registered">LaserJet</trademark>'>
<!ENTITY lisa "<application>Lisa</application>">
<!ENTITY Linux '<trademark class="registered">Linux</trademark>'>
-<!ENTITY Linux-Mandrake "<trademark>Mandrakelinux</trademark>">
<!ENTITY LinuxPPC "<trademark>LinuxPPC</trademark>">
<!ENTITY lskat "<application>Lieutenant Skat</application>">
<!ENTITY LZW "<acronym>LZW</acronym>">
<!ENTITY Mac '<trademark class="registered">Mac</trademark>'>
<!ENTITY MacOS '<trademark class="registered">Mac</trademark> <acronym>OS</acronym>'>
-<!ENTITY Mandrake "<trademark>Mandrake</trademark>">
<!ENTITY marble "<application>Marble</application>">
<!ENTITY megami "<application>Megami</application>">
<!ENTITY Microsoft '<trademark class="registered">Microsoft</trademark>'>
<!ENTITY MIDI "<acronym>MIDI</acronym>">
<!ENTITY MIME "<acronym>MIME</acronym>">
-<!ENTITY moonphase "<application>Moon Phase</application>">
<!ENTITY Motif '<trademark class="registered">Motif</trademark>'>
<!ENTITY MRU "<acronym>MRU</acronym>">
<!ENTITY MTU "<acronym>MTU</acronym>">
<!ENTITY multisynk "<application>MultiSynk</application>">
<!ENTITY MusiXTeX "<application>MusiXTeX</application>">
-<!ENTITY Netscape '<trademark class="registered">Netscape</trademark>'>
-<!ENTITY NeXTSTEP "<trademark>NeXTSTEP</trademark>">
-<!ENTITY noatun "<application>Noatun</application>">
+<!ENTITY okteta "<application>Okteta</application>">
<!ENTITY okular "<application>Okular</application>">
+<!ENTITY palapeli "<application>Palapeli</application>">
<!ENTITY PalmOS '<trademark class="registered">Palm OS</trademark>'>
<!ENTITY PalmPilot "<productname><trademark>PalmPilot</trademark></productname>">
<!ENTITY parley "<application>Parley</application>">
<!ENTITY phonon "<application>Phonon</application>">
-<!ENTITY plasma "<application>Plasma</application>">
+<!ENTITY picmi "<application>Picmi</application>">
+<!ENTITY plasma "<productname>Plasma</productname>">
<!ENTITY plasmagik "<application>Plasmagik</application>">
<!ENTITY plasmoid "<application>Plasmoid</application>">
<!ENTITY plasmoids "<application>Plasmoids</application>">
<!ENTITY PMX "<application>PMX</application>"><!-- acronym too? -->
<!ENTITY PostScript '<trademark class="registered">PostScript</trademark>'>
<!ENTITY PPP "<acronym>PPP</acronym>">
-<!ENTITY quantaplus "<application>Quanta Plus</application>">
<!ENTITY Qt "<trademark>Qt</trademark>">
<!ENTITY RealAudio '<trademark class="registered">RealAudio</trademark>'>
<!ENTITY RealVideo '<trademark class="registered">RealVideo</trademark>'>
<!ENTITY RedHat '<trademark class="registered">Red Hat</trademark>'>
-<!ENTITY reslisa "<application>ResLisa</application>">
<!ENTITY rocs "<application>Rocs</application>">
+<!ENTITY skanlite "<application>Skanlite</application>">
<!ENTITY Sendmail '<application><trademark class="registered">sendmail</trademark></application>'>
+<!ENTITY smb4k "<application>Smb4K</application>">
<!ENTITY SMTP "<acronym>SMTP</acronym>">
<!ENTITY SGI "<trademark>SGI</trademark>">
+<!ENTITY skrooge '<application>Skrooge</application>'>
<!ENTITY snake "<application>SnaKe</application>">
<!ENTITY Solaris "<trademark>Solaris</trademark>">
<!ENTITY step "<application>Step</application>">
<!ENTITY superkaramba "<application>SuperKaramba</application>">
<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+<!ENTITY tellico '<application>Tellico</application>'>
<!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'>
<!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'>
+<!ENTITY trojita "<application>Trojitá</application>">
<!ENTITY ubuntu "<trademark>Ubuntu</trademark>">
<!ENTITY UNIX '<trademark class="registered">UNIX</trademark>'>
<!ENTITY URL "<acronym>URL</acronym>">
@@ -439,21 +425,81 @@
<!ENTITY XHTML "<acronym>XHTML</acronym>">
<!ENTITY XML "<acronym>XML</acronym>">
<!ENTITY XSL "<acronym>XSL</acronym>">
-<!ENTITY zui "<application>Zooming User Interface</application>">
<!-- Defaults, do NOT add anything to this without checking with the docbook
team. -->
-<!ENTITY package "This application isn't part of a KDE package">
<!-- Deprecated, will be removed at a future time, do not use -->
+<!ENTITY aktion "<application>aKtion</application>">
+<!ENTITY arts "<application>aRts</application>">
+<!ENTITY arts-builder "<application>aRts-builder</application>">
+<!ENTITY artscontrol "<application>artscontrol</application>">
+<!ENTITY artsd "<application>artsd</application>">
+<!ENTITY artsdsp "<application>artsdsp</application>">
+<!ENTITY artsserver "<application>artsserver</application>">
+<!ENTITY artsshell "<application>artsshell</application>">
+<!ENTITY artswrapper "<application>artswrapper</application>">
+<!ENTITY atlantik "<application>Atlantik</application>">
<!ENTITY brahms "<application>Brahms</application>">
+<!ENTITY catalogmanager "<application>Catalog Manager</application>">
+<!ENTITY DCOP "<acronym>DCOP</acronym>">
+<!ENTITY flashkard "<application>FlashKard</application>">
<!ENTITY kab2 "<application>Kab2</application>">
+<!ENTITY kaboodle "<application>Kaboodle</application>">
+<!ENTITY kandy "<application>Kandy</application>">
+<!ENTITY kaphorism "<application>KAphorism</application>">
+<!ENTITY karbon14 "<application>Karbon14</application>">
+<!ENTITY kasteroids "<application>KAsteroids</application>">
+<!ENTITY kbabel "<application>KBabel</application>">
+<!ENTITY kbabeldict "<application>KBabelDict</application>">
+<!ENTITY kbiff "<application>KBiff</application>">
+<!ENTITY kbugbuster "<application>kbugbuster</application>">
<!ENTITY kchat "<application>KChat</application>">
+<!ENTITY kdat "<application>KDat</application>">
+<!ENTITY kdcop "<application>kdcop</application>">
+<!ENTITY kdm "<application>kdm</application>">
+<!ENTITY kdmrc "<filename>kdmrc</filename>">
+<!ENTITY kdict "<application>KDict</application>">
+<!ENTITY kdvi "<application>KDVI</application>">
+<!ENTITY kenolaba "<application>Kenolaba</application>">
+<!ENTITY kedit "<application>KEdit</application>">
+<!ENTITY keduca "<application>KEduca</application>">
<!ENTITY keystone "<application>Keystone</application>">
+<!ENTITY khexedit "<application>KHexEdit</application>">
+<!ENTITY kljettool "<application>KLjettool</application>">
+<!ENTITY klpq "<application>Klpq</application>">
+<!ENTITY klprfax "<application>Klprfax</application>">
<!ENTITY knorskverbs "<application>KNorskVerbs</application>">
<!ENTITY kontour "<application>Kontour</application>">
+<!ENTITY kdeprint "<application>KDEPrint</application>">
+<!ENTITY kdesktop "<application>KDesktop</application>">
+<!ENTITY kugar "<application>Kugar</application>">
+<!ENTITY kuickshow "<application>KuickShow</application>">
+<!ENTITY kodometer "<application>KOdometer</application>">
+<!ENTITY koffice "<application>KOffice</application>">
+<!ENTITY koncd "<application>KOnCD</application>">
+<!ENTITY korn "<application>KOrn</application>">
+<!ENTITY koshell "<application>KOShell</application>">
+<!ENTITY kotalkd "<application>KOTalkd</application>">
+<!ENTITY kprinter "<application>kprinter</application>">
+<!ENTITY kpresenter "<application>KPresenter</application>">
+<!ENTITY kreatecd "<application>KreateCD</application>">
+<!ENTITY krec "<application>KRec</application>">
+<!ENTITY Linux-Mandrake "<trademark>Mandrakelinux</trademark>">
+<!ENTITY Mandrake "<trademark>Mandrake</trademark>">
+<!ENTITY moonphase "<application>Moon Phase</application>">
+<!ENTITY Netscape '<trademark class="registered">Netscape</trademark>'>
+<!ENTITY NeXTSTEP "<trademark>NeXTSTEP</trademark>">
+<!ENTITY noatun "<application>Noatun</application>">
+<!ENTITY package "This application isn't part of a KDE package">
<!ENTITY kpanel "<application>KPanel</application>">
<!ENTITY kscore "<application>KScore</application>">
+<!ENTITY ksysv "<application>KSysV</application>">
+<!ENTITY kview "<application>KView</application>">
+<!ENTITY kviewshell "<application>KViewshell</application>">
<!ENTITY tkmidi "<application>tkmidi</application>">
<!ENTITY quanta "<application>Quanta</application>">
+<!ENTITY quantaplus "<application>Quanta Plus</application>">
+<!ENTITY reslisa "<application>ResLisa</application>">
+<!ENTITY zui "<application>Zooming User Interface</application>">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/man-template.docbook new/kdoctools-5.13.0/src/man-template.docbook
--- old/kdoctools-5.12.0/src/man-template.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/man-template.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -15,11 +15,22 @@
<!--Date when this manpage was written, in the ISO 8601 format 'yyyy-mm-dd'-->
<date>2015-04-03</date>
<!--version information of application this manpage is valid for.
+Change date if
+ docbook is updated and verified to be valid for the current app version
+ docbook is proofreaded and verified to be valid for the current app version
-->
-<releaseinfo>$applicationname xx.yy</releaseinfo>
+<releaseinfo>Frameworks xx.yy or Plasma xx.yy or Applications xx.yy or $applicationname xx.yy</releaseinfo>
<!-- replace $applicationname with the application name; &kde; as prefix/namespace could
-be not needed, ask the promo team in case of doubt-->
-<productname>$applicationname</productname>
+be not needed, ask the promo team in case of doubt
+Example:
+Frameworks xx.yy for docbooks in frameworks
+Plasma xx.yy for docbooks in plasma
+Applications xx.yy for docbooks released as Applications
+$applicationname xx.yy (Applications xx.yy) for docbooks with own version released as Applications
+$applicationname xx.yy for applications with independent release schedule (extragear/playground)
+-->
+
+<productname>KDE Frameworks or KDE Plasma or KDE Applications</productname>
</refentryinfo>
<refmeta>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.12.0/src/template.docbook new/kdoctools-5.13.0/src/template.docbook
--- old/kdoctools-5.12.0/src/template.docbook 2015-07-05 11:02:50.000000000 +0200
+++ new/kdoctools-5.13.0/src/template.docbook 2015-08-04 12:55:51.000000000 +0200
@@ -13,7 +13,13 @@
<!-- Do not define any other entities; instead, use the entities
from entities/general.entities and en/user.entities. -->
]>
-
-<releaseinfo>Frameworks or Plasma or Applications or $applicationname xx.yy</releaseinfo>
+<releaseinfo>Frameworks xx.yy or Plasma xx.yy or Applications xx.yy or $applicationname xx.yy (Applications xx.yy) or $applicationname xx.yy</releaseinfo>
<!-- Abstract about this handbook -->