[kio] /: Update imported docbooks cache, proxy, useragent, cookies, netpref, ebrowsing-webshortcuts, smb+trash
Burkhard Lück
lueck at hube-lueck.de
Sat Nov 12 14:13:17 UTC 2016
Git commit e0c3945a88fd041f36ff3873f6fe0ca5cfa00158 by Burkhard Lück.
Committed on 12/11/2016 at 14:08.
Pushed by lueck into branch 'master'.
Update imported docbooks cache,proxy,useragent,cookies,netpref,ebrowsing-webshortcuts,smb+trash
move into existing dir docs using subdir kcontrol5 to make make co-installable, adapt CMakeLists.txt, change dtd to kf5
rename ebrowsing to webshortcuts
reapply a few updates done in plasma-desktop
proofread, bump date + releaseinfo
REVIEW:128912
D +0 -2 doc/kcontrol/cache/CMakeLists.txt
D +0 -2 doc/kcontrol/cookies/CMakeLists.txt
D +0 -2 doc/kcontrol/ebrowsing/CMakeLists.txt
D +0 -2 doc/kcontrol/netpref/CMakeLists.txt
D +0 -2 doc/kcontrol/proxy/CMakeLists.txt
D +0 -2 doc/kcontrol/smb/CMakeLists.txt
D +0 -2 doc/kcontrol/trash/CMakeLists.txt
D +0 -2 doc/kcontrol/useragent/CMakeLists.txt
M +1 -0 docs/CMakeLists.txt
A +8 -0 docs/kcontrol5/CMakeLists.txt
A +2 -0 docs/kcontrol5/cache/CMakeLists.txt
R +5 -5 docs/kcontrol5/cache/index.docbook [from: doc/kcontrol/cache/index.docbook - 091% similarity]
A +2 -0 docs/kcontrol5/cookies/CMakeLists.txt
R +5 -5 docs/kcontrol5/cookies/index.docbook [from: doc/kcontrol/cookies/index.docbook - 097% similarity]
A +2 -0 docs/kcontrol5/netpref/CMakeLists.txt
R +2 -2 docs/kcontrol5/netpref/index.docbook [from: doc/kcontrol/netpref/index.docbook - 097% similarity]
A +2 -0 docs/kcontrol5/proxy/CMakeLists.txt
R +4 -34 docs/kcontrol5/proxy/index.docbook [from: doc/kcontrol/proxy/index.docbook - 084% similarity]
A +2 -0 docs/kcontrol5/smb/CMakeLists.txt
R +4 -14 docs/kcontrol5/smb/index.docbook [from: doc/kcontrol/smb/index.docbook - 084% similarity]
A +2 -0 docs/kcontrol5/trash/CMakeLists.txt
R +4 -4 docs/kcontrol5/trash/index.docbook [from: doc/kcontrol/trash/index.docbook - 092% similarity]
A +2 -0 docs/kcontrol5/useragent/CMakeLists.txt
R +8 -10 docs/kcontrol5/useragent/index.docbook [from: doc/kcontrol/useragent/index.docbook - 087% similarity]
A +2 -0 docs/kcontrol5/webshortcuts/CMakeLists.txt
R +6 -5 docs/kcontrol5/webshortcuts/index.docbook [from: doc/kcontrol/ebrowsing/index.docbook - 096% similarity]
M +1 -1 src/ioslaves/trash/kcmtrash.desktop
M +1 -1 src/kcms/kio/cache.desktop
M +1 -1 src/kcms/kio/cookies.desktop
M +1 -1 src/kcms/kio/netpref.desktop
M +1 -1 src/kcms/kio/proxy.desktop
M +1 -1 src/kcms/kio/smb.desktop
M +1 -1 src/kcms/kio/useragent.desktop
M +1 -1 src/kcms/webshortcuts/webshortcuts.desktop
http://commits.kde.org/kio/e0c3945a88fd041f36ff3873f6fe0ca5cfa00158
diff --git a/doc/kcontrol/cache/CMakeLists.txt b/doc/kcontrol/cache/CMakeLists.txt
deleted file mode 100644
index 7509aba..0000000
--- a/doc/kcontrol/cache/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cache)
diff --git a/doc/kcontrol/cookies/CMakeLists.txt b/doc/kcontrol/cookies/CMakeLists.txt
deleted file mode 100644
index 88fac29..0000000
--- a/doc/kcontrol/cookies/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cookies)
diff --git a/doc/kcontrol/ebrowsing/CMakeLists.txt b/doc/kcontrol/ebrowsing/CMakeLists.txt
deleted file mode 100644
index 2bdd4b0..0000000
--- a/doc/kcontrol/ebrowsing/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/ebrowsing)
diff --git a/doc/kcontrol/netpref/CMakeLists.txt b/doc/kcontrol/netpref/CMakeLists.txt
deleted file mode 100644
index 1d634b5..0000000
--- a/doc/kcontrol/netpref/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/netpref)
diff --git a/doc/kcontrol/proxy/CMakeLists.txt b/doc/kcontrol/proxy/CMakeLists.txt
deleted file mode 100644
index 7777c4e..0000000
--- a/doc/kcontrol/proxy/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/proxy)
diff --git a/doc/kcontrol/smb/CMakeLists.txt b/doc/kcontrol/smb/CMakeLists.txt
deleted file mode 100644
index 295359a..0000000
--- a/doc/kcontrol/smb/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/smb)
diff --git a/doc/kcontrol/trash/CMakeLists.txt b/doc/kcontrol/trash/CMakeLists.txt
deleted file mode 100644
index 559f8e3..0000000
--- a/doc/kcontrol/trash/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/trash)
diff --git a/doc/kcontrol/useragent/CMakeLists.txt b/doc/kcontrol/useragent/CMakeLists.txt
deleted file mode 100644
index c350c7b..0000000
--- a/doc/kcontrol/useragent/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/useragent)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 350bce3..b88f5d4 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,2 +1,3 @@
add_subdirectory(kcookiejar5)
add_subdirectory(kioslave5)
+add_subdirectory(kcontrol5)
diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
new file mode 100644
index 0000000..1b19e5e
--- /dev/null
+++ b/docs/kcontrol5/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(cache)
+add_subdirectory(cookies)
+add_subdirectory(netpref)
+add_subdirectory(proxy)
+add_subdirectory(smb)
+add_subdirectory(trash)
+add_subdirectory(useragent)
+add_subdirectory(webshortcuts)
diff --git a/docs/kcontrol5/cache/CMakeLists.txt b/docs/kcontrol5/cache/CMakeLists.txt
new file mode 100644
index 0000000..9ec5e67
--- /dev/null
+++ b/docs/kcontrol5/cache/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/cache)
diff --git a/doc/kcontrol/cache/index.docbook b/docs/kcontrol5/cache/index.docbook
similarity index 91%
rename from doc/kcontrol/cache/index.docbook
rename to docs/kcontrol5/cache/index.docbook
index ce9ead3..95119e3 100644
--- a/doc/kcontrol/cache/index.docbook
+++ b/docs/kcontrol5/cache/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -15,8 +15,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2009-11-20</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -29,7 +29,7 @@
<para>This module allows you to control the size of the local cache
folder used by &konqueror;. Note that each user account on your
computer has a separate cache folder, and this folder is not
-shared with other web browsers such as &Netscape;.</para>
+shared with other web browsers such as &firefox;.</para>
<para>Storing local copies of web pages that you have visited allows
&konqueror; to quickly load their contents on subsequent visits. It
diff --git a/docs/kcontrol5/cookies/CMakeLists.txt b/docs/kcontrol5/cookies/CMakeLists.txt
new file mode 100644
index 0000000..90d1600
--- /dev/null
+++ b/docs/kcontrol5/cookies/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/cookies)
diff --git a/doc/kcontrol/cookies/index.docbook b/docs/kcontrol5/cookies/index.docbook
similarity index 97%
rename from doc/kcontrol/cookies/index.docbook
rename to docs/kcontrol5/cookies/index.docbook
index cd81733..4daeb7e 100644
--- a/doc/kcontrol/cookies/index.docbook
+++ b/docs/kcontrol5/cookies/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -14,8 +14,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2012-11-11</date>
-<releaseinfo>&kde; 4.10</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -51,7 +51,7 @@ for the use of cookies when you are browsing the web with the
<warning><para>Note that the policies that you set using this control
module will <emphasis>not</emphasis> apply to other web browsers such
-as &Netscape;.</para></warning>
+as &firefox;.</para></warning>
<sect2 id="cookie-policy">
diff --git a/docs/kcontrol5/netpref/CMakeLists.txt b/docs/kcontrol5/netpref/CMakeLists.txt
new file mode 100644
index 0000000..82b2028
--- /dev/null
+++ b/docs/kcontrol5/netpref/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/netpref)
diff --git a/doc/kcontrol/netpref/index.docbook b/docs/kcontrol5/netpref/index.docbook
similarity index 97%
rename from doc/kcontrol/netpref/index.docbook
rename to docs/kcontrol5/netpref/index.docbook
index d5436bb..6e1e78e 100644
--- a/doc/kcontrol/netpref/index.docbook
+++ b/docs/kcontrol5/netpref/index.docbook
@@ -14,8 +14,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2013-12-05</date>
-<releaseinfo>&kde; 4.12</releaseinfo>
+<date>2016-16-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/docs/kcontrol5/proxy/CMakeLists.txt b/docs/kcontrol5/proxy/CMakeLists.txt
new file mode 100644
index 0000000..7609389
--- /dev/null
+++ b/docs/kcontrol5/proxy/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/proxy)
diff --git a/doc/kcontrol/proxy/index.docbook b/docs/kcontrol5/proxy/index.docbook
similarity index 84%
rename from doc/kcontrol/proxy/index.docbook
rename to docs/kcontrol5/proxy/index.docbook
index ec5d777..32d206d 100644
--- a/doc/kcontrol/proxy/index.docbook
+++ b/docs/kcontrol5/proxy/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -13,8 +13,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2013-12-05</date>
-<releaseinfo>&kde; 4.12</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -173,37 +173,7 @@ script.</para>
</variablelist>
</sect2>
-<!-- not in 4.8 anymore
-What if authorization is needed?
-
-<sect2 id="authorization">
-<title><guilabel>Authorization</guilabel></title>
-
-<para>Here you can choose between two types of authentication, if your
-proxy requires it. You can have <guilabel>Prompt as
-needed</guilabel>, the default, in which case &konqueror; will only
-ask for a username or password if it needs to.</para>
-
-<para>The other option is to use automatic login.
-Select this option and enter <guilabel>Username</guilabel> and <guilabel>Password</guilabel>.
-</para>
-
-</sect2>
-
-<sect2 id="options">
-<title><guilabel>Options</guilabel></title>
-<variablelist>
-<varlistentry>
-<term><guilabel>Use persistent connections to proxy</guilabel></term>
-<listitem>
-<para>Use persistent connection to your proxy server. Keeps connection to proxy open, helps lower bandwidth/speed up connection. Enabling this option will require the proxy server's cooperation, if the proxy server does not support this, it will bring your internet to a stop. </para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
--->
</sect1>
</article>
diff --git a/docs/kcontrol5/smb/CMakeLists.txt b/docs/kcontrol5/smb/CMakeLists.txt
new file mode 100644
index 0000000..02d31d8
--- /dev/null
+++ b/docs/kcontrol5/smb/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/smb)
diff --git a/doc/kcontrol/smb/index.docbook b/docs/kcontrol5/smb/index.docbook
similarity index 84%
rename from doc/kcontrol/smb/index.docbook
rename to docs/kcontrol5/smb/index.docbook
index 70d331d..b94d284 100644
--- a/doc/kcontrol/smb/index.docbook
+++ b/docs/kcontrol5/smb/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -14,8 +14,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2013-12-05</date>
-<releaseinfo>&kde; 4.12</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -87,16 +87,6 @@ conscious environment, you should not store your password here but
rather enter it anew every time you need to access an
<acronym>SMB</acronym> host.</para></important>
-<!-- not in kde 4
-<para>In the <guilabel>Workgroup</guilabel> field, you can enter your
-workgroup name. If you don't know it, ask your system administrator
-or have a look at other already configured machines in your network.
-However, in most cases providing the workgroup name is not required,
-so you probably can also leave this empty.</para>
-
-<para>If the option <guilabel>Show hidden shares</guilabel> is
-checked, shares ending with a <quote>$</quote> will be shown.</para>
--->
</sect2>
</sect1>
diff --git a/docs/kcontrol5/trash/CMakeLists.txt b/docs/kcontrol5/trash/CMakeLists.txt
new file mode 100644
index 0000000..42502d1
--- /dev/null
+++ b/docs/kcontrol5/trash/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/trash)
diff --git a/doc/kcontrol/trash/index.docbook b/docs/kcontrol5/trash/index.docbook
similarity index 92%
rename from doc/kcontrol/trash/index.docbook
rename to docs/kcontrol5/trash/index.docbook
index 099d6db..c381511 100644
--- a/doc/kcontrol/trash/index.docbook
+++ b/docs/kcontrol5/trash/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>
@@ -12,8 +12,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2009-11-24</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/docs/kcontrol5/useragent/CMakeLists.txt b/docs/kcontrol5/useragent/CMakeLists.txt
new file mode 100644
index 0000000..2a480f1
--- /dev/null
+++ b/docs/kcontrol5/useragent/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/useragent)
diff --git a/doc/kcontrol/useragent/index.docbook b/docs/kcontrol5/useragent/index.docbook
similarity index 87%
rename from doc/kcontrol/useragent/index.docbook
rename to docs/kcontrol5/useragent/index.docbook
index 816e379..54fac97 100644
--- a/doc/kcontrol/useragent/index.docbook
+++ b/docs/kcontrol5/useragent/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -13,8 +13,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2009-11-24</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -79,12 +79,10 @@ character <token>*</token> in this text box. However, the string
<userinput>kde.org</userinput> will match all hosts in the domain
<systemitem>kde.org</systemitem></para>
-<para>After typing the name of the server, type in the identifying
+<para>After typing the name of the server, select the identifying
string in the next combo box, which is labeled <guilabel>Use the
-following identification:</guilabel>, or choose a string from the list. If
-you don't choose a string from the list, you will need to know what a
-valid string from the browser looks like. For example, you could type
-<userinput>Mozilla/4.0 (compatible; MSIE 4.0)</userinput>. </para>
+following identification:</guilabel>. The <guilabel>Real identification</guilabel>
+&ie; the strings sent to the server, is displayed in the field.</para>
<para>You can click on an existing entry in the list, and then modify the contents of the
text boxes, followed by clicking <guibutton>Change...</guibutton>.</para>
@@ -107,4 +105,4 @@ displayed in bold text at the top of the page.</para>
</sect1>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/kcontrol5/webshortcuts/CMakeLists.txt b/docs/kcontrol5/webshortcuts/CMakeLists.txt
new file mode 100644
index 0000000..430dda6
--- /dev/null
+++ b/docs/kcontrol5/webshortcuts/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/webshortcuts)
diff --git a/doc/kcontrol/ebrowsing/index.docbook b/docs/kcontrol5/webshortcuts/index.docbook
similarity index 96%
rename from doc/kcontrol/ebrowsing/index.docbook
rename to docs/kcontrol5/webshortcuts/index.docbook
index 63e6f69..85a1513 100644
--- a/doc/kcontrol/ebrowsing/index.docbook
+++ b/docs/kcontrol5/webshortcuts/index.docbook
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -14,8 +14,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2013-05-30</date>
-<releaseinfo>&kde; 4.11</releaseinfo>
+<date>2016-11-10</date>
+<releaseinfo>Frameworks 5.29</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -40,7 +40,8 @@ experience. One such feature is <emphasis>Web Shortcuts</emphasis>.</para>
<para>You may already have noticed that &kde; is very Internet friendly.
For example, you can click on the <guimenuitem>Run</guimenuitem> menu
item or type the keyboard shortcut assigned to that command (<keycombo
-action="simul">&Alt;<keycap>F2</keycap></keycombo>,
+action="simul">&Alt;<keycap>F2</keycap></keycombo> or <keycombo
+action="simul">&Alt;<keycap>Space</keycap></keycombo>,
unless you have changed it) and type in a &URI;.
<footnote><para>Uniform Resource Identifier. A standardized way of
referring to a resource such as a file on your computer, a World Wide
diff --git a/src/ioslaves/trash/kcmtrash.desktop b/src/ioslaves/trash/kcmtrash.desktop
index c8ff4ac..8e6e920 100644
--- a/src/ioslaves/trash/kcmtrash.desktop
+++ b/src/ioslaves/trash/kcmtrash.desktop
@@ -388,4 +388,4 @@ X-KDE-Keywords[wa]=batch
X-KDE-Keywords[x-test]=xxtrashxx
X-KDE-Keywords[zh_CN]=trash,回收站
X-KDE-Keywords[zh_TW]=trash
-X-DocPath=kcontrol/trash/index.html
+X-DocPath=kcontrol5/trash/index.html
diff --git a/src/kcms/kio/cache.desktop b/src/kcms/kio/cache.desktop
index f0bd261..01d229d 100644
--- a/src/kcms/kio/cache.desktop
+++ b/src/kcms/kio/cache.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/cache/index.html
+X-DocPath=kcontrol5/cache/index.html
Icon=preferences-web-browser-cache
Exec=kcmshell5 cache
diff --git a/src/kcms/kio/cookies.desktop b/src/kcms/kio/cookies.desktop
index f91b5cd..b1b299c 100644
--- a/src/kcms/kio/cookies.desktop
+++ b/src/kcms/kio/cookies.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/cookies/index.html
+X-DocPath=kcontrol5/cookies/index.html
Icon=preferences-web-browser-cookies
Exec=kcmshell5 cookies
diff --git a/src/kcms/kio/netpref.desktop b/src/kcms/kio/netpref.desktop
index 963ef3f..0a378b5 100644
--- a/src/kcms/kio/netpref.desktop
+++ b/src/kcms/kio/netpref.desktop
@@ -3,7 +3,7 @@ Exec=kcmshell5 netpref
Icon=preferences-system-network-connection
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/netpref/index.html
+X-DocPath=kcontrol5/netpref/index.html
X-KDE-Library=kcm_kio
X-KDE-PluginKeyword=netpref
diff --git a/src/kcms/kio/proxy.desktop b/src/kcms/kio/proxy.desktop
index c11451d..30aadb5 100644
--- a/src/kcms/kio/proxy.desktop
+++ b/src/kcms/kio/proxy.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/proxy/index.html
+X-DocPath=kcontrol5/proxy/index.html
Icon=preferences-system-network-proxy
Exec=kcmshell5 proxy
diff --git a/src/kcms/kio/smb.desktop b/src/kcms/kio/smb.desktop
index c323614..808610f 100644
--- a/src/kcms/kio/smb.desktop
+++ b/src/kcms/kio/smb.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/smb/index.html
+X-DocPath=kcontrol5/smb/index.html
Icon=preferences-system-network-share-windows
Exec=kcmshell5 smb
diff --git a/src/kcms/kio/useragent.desktop b/src/kcms/kio/useragent.desktop
index 856e9cc..bc4b266 100644
--- a/src/kcms/kio/useragent.desktop
+++ b/src/kcms/kio/useragent.desktop
@@ -3,7 +3,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
Icon=preferences-web-browser-identification
Exec=kcmshell5 useragent
-X-DocPath=kcontrol/useragent/index.html
+X-DocPath=kcontrol5/useragent/index.html
X-KDE-Library=kcm_kio
X-KDE-System-Settings-Parent-Category=networksettings
diff --git a/src/kcms/webshortcuts/webshortcuts.desktop b/src/kcms/webshortcuts/webshortcuts.desktop
index 24fbb2a..4a34f7d 100644
--- a/src/kcms/webshortcuts/webshortcuts.desktop
+++ b/src/kcms/webshortcuts/webshortcuts.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/webshortcuts/index.html
+X-DocPath=kcontrol5/webshortcuts/index.html
Icon=preferences-web-browser-shortcuts
Exec=kcmshell5 webshortcuts
More information about the kde-doc-english
mailing list