[simon/kf5] doc: doc: updates to the DTD and the destination variable

Luigi Toscano null at kde.org
Mon May 1 14:07:05 UTC 2017 

Git commit 8c9bc67c1b856aa79a8ef7cd8b9d868fb74fe890 by Luigi Toscano.
Committed on 01/05/2017 at 13:58.
Pushed by ltoscano into branch 'kf5'.

doc: updates to the DTD and the destination variable

- use the native Frameworks DTD;
- use the new ECM variable for the path of the documentation directory.

M  +1    -1    doc/afaras/CMakeLists.txt
M  +1    -1    doc/afaras/index.docbook
M  +1    -1    doc/ksimond/CMakeLists.txt
M  +1    -1    doc/ksimond/index.docbook
M  +1    -1    doc/sam/CMakeLists.txt
M  +1    -1    doc/sam/index.docbook
M  +1    -1    doc/simon/CMakeLists.txt
M  +1    -1    doc/simon/index.docbook
M  +1    -1    doc/simond/CMakeLists.txt
M  +1    -1    doc/simond/index.docbook
M  +1    -1    doc/ssc/CMakeLists.txt
M  +1    -1    doc/ssc/index.docbook
M  +1    -1    doc/sscd/CMakeLists.txt
M  +1    -1    doc/sscd/index.docbook

https://commits.kde.org/simon/8c9bc67c1b856aa79a8ef7cd8b9d868fb74fe890

diff --git a/doc/afaras/CMakeLists.txt b/doc/afaras/CMakeLists.txt
index 09b51084..bae05b6e 100644
--- a/doc/afaras/CMakeLists.txt
+++ b/doc/afaras/CMakeLists.txt
@@ -1,2 +1,2 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en
   SUBDIR afaras)
diff --git a/doc/afaras/index.docbook b/doc/afaras/index.docbook
index 1feaa387..639204bf 100644
--- a/doc/afaras/index.docbook
+++ b/doc/afaras/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>Afaras</application>">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
diff --git a/doc/ksimond/CMakeLists.txt b/doc/ksimond/CMakeLists.txt
index 47dcdd6d..e5bbecb8 100644
--- a/doc/ksimond/CMakeLists.txt
+++ b/doc/ksimond/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksimond)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR ksimond)
diff --git a/doc/ksimond/index.docbook b/doc/ksimond/index.docbook
index 355b3f64..ae0be33f 100644
--- a/doc/ksimond/index.docbook
+++ b/doc/ksimond/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>KSimond</application>">
   <!ENTITY kappname "&kmyapplication;">
   <!ENTITY package "kde-module">
diff --git a/doc/sam/CMakeLists.txt b/doc/sam/CMakeLists.txt
index a27a4185..b6a0a042 100644
--- a/doc/sam/CMakeLists.txt
+++ b/doc/sam/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR sam)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR sam)
diff --git a/doc/sam/index.docbook b/doc/sam/index.docbook
index 67e46d52..0a835883 100644
--- a/doc/sam/index.docbook
+++ b/doc/sam/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>Sam</application>">
   <!ENTITY kappname "&kmyapplication;">
   <!ENTITY package "kde-module">
diff --git a/doc/simon/CMakeLists.txt b/doc/simon/CMakeLists.txt
index 3542c924..0db2da26 100644
--- a/doc/simon/CMakeLists.txt
+++ b/doc/simon/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR simon)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR simon)
diff --git a/doc/simon/index.docbook b/doc/simon/index.docbook
index e54fc9f1..251f9b86 100644
--- a/doc/simon/index.docbook
+++ b/doc/simon/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>Simon</application>">
   <!ENTITY kappname "&kmyapplication;">
   <!ENTITY package "kde-module">
diff --git a/doc/simond/CMakeLists.txt b/doc/simond/CMakeLists.txt
index 125025ea..3a50914f 100644
--- a/doc/simond/CMakeLists.txt
+++ b/doc/simond/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR simond)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR simond)
diff --git a/doc/simond/index.docbook b/doc/simond/index.docbook
index 898ec68f..52450dea 100644
--- a/doc/simond/index.docbook
+++ b/doc/simond/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>Simond</application>">
   <!ENTITY kappname "&kmyapplication;">
   <!ENTITY package "kde-module">
diff --git a/doc/ssc/CMakeLists.txt b/doc/ssc/CMakeLists.txt
index f7548768..48bd8f1d 100644
--- a/doc/ssc/CMakeLists.txt
+++ b/doc/ssc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ssc)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR ssc)
diff --git a/doc/ssc/index.docbook b/doc/ssc/index.docbook
index 18d0e9a5..2778e963 100644
--- a/doc/ssc/index.docbook
+++ b/doc/ssc/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>SSC</application>">
   <!ENTITY kappname "&kmyapplication;">
   <!ENTITY package "kde-module">
diff --git a/doc/sscd/CMakeLists.txt b/doc/sscd/CMakeLists.txt
index 3261b0ad..9e6f08c8 100644
--- a/doc/sscd/CMakeLists.txt
+++ b/doc/sscd/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR sscd)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR sscd)
diff --git a/doc/sscd/index.docbook b/doc/sscd/index.docbook
index 1e967ea9..1bad7ed8 100644
--- a/doc/sscd/index.docbook
+++ b/doc/sscd/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
   <!ENTITY kmyapplication "<application>SSCd</application>">
   <!ENTITY kappname "&kmyapplication;">
   <!ENTITY package "kde-module">

More information about the kde-doc-english mailing list