[plasma-desktop] doc/kcontrol: remove kcm docbooks which have their code in other repos from plasma-desktop

Burkhard Lück lueck at hube-lueck.de
Sun Nov 13 00:06:39 UTC 2016


Git commit e9bf567e4531ab01c7d0d73274771797dd397125 by Burkhard Lück.
Committed on 13/11/2016 at 00:03.
Pushed by lueck into branch 'master'.

remove kcm docbooks which have their code in other repos from plasma-desktop

remove kcm docbooks for cache, proxy, useragent, cookies, netpref, webshortcuts, smb
these docbooks are imported into frameworks/kio from kde-runtime master, see https://git.reviewboard.kde.org/r/128912/
remove kcm docbook for filetypes, this docbook is imported into kde-cli-tools from kde-runtime master, see https://git.reviewboard.kde.org/r/128914/
REVIEW:129380

M  +0    -10   doc/kcontrol/CMakeLists.txt
M  +1    -1    doc/kcontrol/cache/index.docbook
M  +1    -1    doc/kcontrol/cookies/index.docbook
M  +1    -2    doc/kcontrol/filetypes/index.docbook
M  +1    -1    doc/kcontrol/netpref/index.docbook
M  +1    -1    doc/kcontrol/proxy/index.docbook
M  +1    -1    doc/kcontrol/smb/index.docbook
M  +2    -2    doc/kcontrol/useragent/index.docbook
M  +1    -1    doc/kcontrol/webshortcuts/index.docbook

http://commits.kde.org/plasma-desktop/e9bf567e4531ab01c7d0d73274771797dd397125

diff --git a/doc/kcontrol/CMakeLists.txt b/doc/kcontrol/CMakeLists.txt
index c057288..7c5fc8b 100644
--- a/doc/kcontrol/CMakeLists.txt
+++ b/doc/kcontrol/CMakeLists.txt
@@ -8,8 +8,6 @@ ecm_optional_add_subdirectory(solid-actions)
 ecm_optional_add_subdirectory(splashscreen)
 ecm_optional_add_subdirectory(icons)
 ecm_optional_add_subdirectory(cookies)
-ecm_optional_add_subdirectory(ebrowsing)
-ecm_optional_add_subdirectory(useragent)
 ecm_optional_add_subdirectory(emoticons)
 ecm_optional_add_subdirectory(baloo)
 
@@ -23,21 +21,13 @@ ecm_optional_add_subdirectory(keyboard)
 ecm_optional_add_subdirectory(mouse)
 ecm_optional_add_subdirectory(paths)
 ecm_optional_add_subdirectory(kcmsmserver)
-ecm_optional_add_subdirectory(cache)
-ecm_optional_add_subdirectory(filetypes)
 ecm_optional_add_subdirectory(kcmlaunch)
 ecm_optional_add_subdirectory(kcmnotify)
 ecm_optional_add_subdirectory(translations)
 ecm_optional_add_subdirectory(formats)
-ecm_optional_add_subdirectory(netpref)
-ecm_optional_add_subdirectory(proxy)
 ecm_optional_add_subdirectory(spellchecking)
 ecm_optional_add_subdirectory(componentchooser)
 ecm_optional_add_subdirectory(kded)
 ecm_optional_add_subdirectory(solid-device-automounter)
 ecm_optional_add_subdirectory(phonon)
 
-if ( NOT Q_WS_WIN )
-    ecm_optional_add_subdirectory(smb)
-endif ()
-
diff --git a/doc/kcontrol/cache/index.docbook b/doc/kcontrol/cache/index.docbook
index a03658e..3661f28 100644
--- a/doc/kcontrol/cache/index.docbook
+++ b/doc/kcontrol/cache/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="cache" lang="&language;">
 <title>Cache</title>
 <articleinfo>
diff --git a/doc/kcontrol/cookies/index.docbook b/doc/kcontrol/cookies/index.docbook
index a2379b9..a28b7b1 100644
--- a/doc/kcontrol/cookies/index.docbook
+++ b/doc/kcontrol/cookies/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="cookies" lang="&language;">
 <articleinfo>
 <title>Cookies</title>
diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook
index bf40a12..3e53332 100644
--- a/doc/kcontrol/filetypes/index.docbook
+++ b/doc/kcontrol/filetypes/index.docbook
@@ -1,11 +1,10 @@
 <?xml version="1.0" ?>
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
 "dtd/kdedbx45.dtd" [
-<!ENTITY calligrawords "<application>Calligra Words</application>">
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in kde-cli-tools - docbook in plasma-desktop? -->
 <article id="filetypes" lang="&language;">
 <articleinfo>
 
diff --git a/doc/kcontrol/netpref/index.docbook b/doc/kcontrol/netpref/index.docbook
index 7db99a6..643c01e 100644
--- a/doc/kcontrol/netpref/index.docbook
+++ b/doc/kcontrol/netpref/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="netpref" lang="&language;">
 <articleinfo>
 <title>Connection Preferences</title>
diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook
index a7bc293..48864fc 100644
--- a/doc/kcontrol/proxy/index.docbook
+++ b/doc/kcontrol/proxy/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="proxy" lang="&language;">
 <title>Proxy</title>
 <articleinfo>
diff --git a/doc/kcontrol/smb/index.docbook b/doc/kcontrol/smb/index.docbook
index f42f9a4..0197c53 100644
--- a/doc/kcontrol/smb/index.docbook
+++ b/doc/kcontrol/smb/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="smb" lang="&language;">
 <articleinfo>
 <title>Windows Shares</title>
diff --git a/doc/kcontrol/useragent/index.docbook b/doc/kcontrol/useragent/index.docbook
index 6a816ab..24bc9b2 100644
--- a/doc/kcontrol/useragent/index.docbook
+++ b/doc/kcontrol/useragent/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="useragent" lang="&language;">
 <title>Browser Identification</title>
 <articleinfo>
@@ -107,4 +107,4 @@ displayed in bold text at the top of the page.</para>
 
 </sect1>
 
-</article>
\ No newline at end of file
+</article>
diff --git a/doc/kcontrol/webshortcuts/index.docbook b/doc/kcontrol/webshortcuts/index.docbook
index bde3028..81893ab 100644
--- a/doc/kcontrol/webshortcuts/index.docbook
+++ b/doc/kcontrol/webshortcuts/index.docbook
@@ -4,7 +4,7 @@
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
-
+<!--FIXME code in frameworks/kio - docbook in plasma-desktop? -->
 <article id="ebrowsing" lang="&language;">
 <articleinfo>
 <title>Web Shortcuts</title>


More information about the kde-doc-english mailing list