[konqueror] /: update imported kcm docbooks to kf5
Burkhard Lück
lueck at hube-lueck.de
Fri Nov 11 14:37:13 UTC 2016
Git commit bf6457d78a1c82756123742ecae3adf9edb1d466 by Burkhard Lück.
Committed on 11/11/2016 at 14:36.
Pushed by lueck into branch 'master'.
update imported kcm docbooks to kf5
add kcm docbboks and the konqueror docbook to the build system
rename subdir kcontrol to kcontrol5 and adapt X-DocPath entries to install the kcm docbooks in subdir kcontrol5 to be co-installable
update dtd
bump date + releaseinfo
proofread + update
@David Faure:
the konqueror repo has three additional desktop files (kcmcss.desktop, fileappearance.desktop, webappearance.desktop, webbehavior.desktop)
with a X-DocPath entry, but these files are not installed and unsued?
Differential Revision: https://phabricator.kde.org/D3310
M +5 -1 CMakeLists.txt
M +1 -1 doc/CMakeLists.txt
D +0 -2 doc/kcontrol/bookmarks/CMakeLists.txt
D +0 -2 doc/kcontrol/filemanager/CMakeLists.txt
D +0 -2 doc/kcontrol/history/CMakeLists.txt
D +0 -2 doc/kcontrol/kcmcss/CMakeLists.txt
D +0 -2 doc/kcontrol/khtml-adblock/CMakeLists.txt
D +0 -2 doc/kcontrol/khtml-behavior/CMakeLists.txt
D +0 -2 doc/kcontrol/khtml-general/CMakeLists.txt
D +0 -2 doc/kcontrol/khtml-java-js/CMakeLists.txt
D +0 -2 doc/kcontrol/performance/CMakeLists.txt
D +0 -91 doc/kcontrol/performance/index.docbook
A +9 -0 doc/kcontrol5/CMakeLists.txt
A +2 -0 doc/kcontrol5/bookmarks/CMakeLists.txt
R +5 -4 doc/kcontrol5/bookmarks/index.docbook [from: doc/kcontrol/bookmarks/index.docbook - 094% similarity]
A +2 -0 doc/kcontrol5/filemanager/CMakeLists.txt
R +4 -4 doc/kcontrol5/filemanager/index.docbook [from: doc/kcontrol/filemanager/index.docbook - 092% similarity]
A +2 -0 doc/kcontrol5/history/CMakeLists.txt
R +2 -2 doc/kcontrol5/history/index.docbook [from: doc/kcontrol/history/index.docbook - 095% similarity]
A +2 -0 doc/kcontrol5/kcmcss/CMakeLists.txt
R +5 -5 doc/kcontrol5/kcmcss/index.docbook [from: doc/kcontrol/kcmcss/index.docbook - 098% similarity]
A +2 -0 doc/kcontrol5/khtml-adblock/CMakeLists.txt
R +4 -8 doc/kcontrol5/khtml-adblock/index.docbook [from: doc/kcontrol/khtml-adblock/index.docbook - 091% similarity]
A +2 -0 doc/kcontrol5/khtml-behavior/CMakeLists.txt
R +4 -5 doc/kcontrol5/khtml-behavior/index.docbook [from: doc/kcontrol/khtml-behavior/index.docbook - 094% similarity]
A +2 -0 doc/kcontrol5/khtml-general/CMakeLists.txt
R +4 -14 doc/kcontrol5/khtml-general/index.docbook [from: doc/kcontrol/khtml-general/index.docbook - 089% similarity]
A +2 -0 doc/kcontrol5/khtml-java-js/CMakeLists.txt
R +4 -5 doc/kcontrol5/khtml-java-js/index.docbook [from: doc/kcontrol/khtml-java-js/index.docbook - 096% similarity]
A +2 -0 doc/kcontrol5/performance/CMakeLists.txt
A +46 -0 doc/kcontrol5/performance/index.docbook
M +7 -5 doc/man-kbookmarkmerger.1.docbook
M +1 -1 settings/bookmarks/bookmarks.desktop
M +1 -1 settings/konq/filebehavior.desktop
M +1 -1 settings/konqhtml/khtml_behavior.desktop
M +1 -1 settings/konqhtml/khtml_filter.desktop
M +1 -1 settings/konqhtml/khtml_general.desktop
M +1 -1 settings/konqhtml/khtml_java_js.desktop
M +1 -1 sidebar/history_module/kcmhistory.desktop
http://commits.kde.org/konqueror/bf6457d78a1c82756123742ecae3adf9edb1d466
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef89688..d3177b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash)
-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities) # Optional
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional
find_package(KDED REQUIRED)
@@ -52,6 +52,10 @@ add_subdirectory( pics )
add_subdirectory( settings )
add_subdirectory( plugins )
+if (KF5DocTools_FOUND)
+ add_subdirectory( doc )
+endif()
+
########### install files ###############
install( PROGRAMS
kfmclient.desktop kfmclient_html.desktop kfmclient_war.desktop
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 6f75c10..1bc7490 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,6 +1,6 @@
########### install files ###############
-find_package(KF5 REQUIRED DocTools)
+add_subdirectory( kcontrol5 )
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR konqueror)
kdoctools_create_manpage(man-kbookmarkmerger.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
diff --git a/doc/kcontrol/bookmarks/CMakeLists.txt b/doc/kcontrol/bookmarks/CMakeLists.txt
deleted file mode 100644
index 2f98e64..0000000
--- a/doc/kcontrol/bookmarks/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/bookmarks)
diff --git a/doc/kcontrol/filemanager/CMakeLists.txt b/doc/kcontrol/filemanager/CMakeLists.txt
deleted file mode 100644
index 65689b0..0000000
--- a/doc/kcontrol/filemanager/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/filemanager)
diff --git a/doc/kcontrol/history/CMakeLists.txt b/doc/kcontrol/history/CMakeLists.txt
deleted file mode 100644
index fcd8d59..0000000
--- a/doc/kcontrol/history/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/history)
diff --git a/doc/kcontrol/kcmcss/CMakeLists.txt b/doc/kcontrol/kcmcss/CMakeLists.txt
deleted file mode 100644
index f2c5b58..0000000
--- a/doc/kcontrol/kcmcss/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcmcss)
diff --git a/doc/kcontrol/khtml-adblock/CMakeLists.txt b/doc/kcontrol/khtml-adblock/CMakeLists.txt
deleted file mode 100644
index c50b0f1..0000000
--- a/doc/kcontrol/khtml-adblock/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/khtml-adblock)
diff --git a/doc/kcontrol/khtml-behavior/CMakeLists.txt b/doc/kcontrol/khtml-behavior/CMakeLists.txt
deleted file mode 100644
index 71ad7fb..0000000
--- a/doc/kcontrol/khtml-behavior/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/khtml-behavior)
diff --git a/doc/kcontrol/khtml-general/CMakeLists.txt b/doc/kcontrol/khtml-general/CMakeLists.txt
deleted file mode 100644
index 23cdaef..0000000
--- a/doc/kcontrol/khtml-general/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/khtml-general)
diff --git a/doc/kcontrol/khtml-java-js/CMakeLists.txt b/doc/kcontrol/khtml-java-js/CMakeLists.txt
deleted file mode 100644
index c91facf..0000000
--- a/doc/kcontrol/khtml-java-js/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/khtml-java-js)
diff --git a/doc/kcontrol/performance/CMakeLists.txt b/doc/kcontrol/performance/CMakeLists.txt
deleted file mode 100644
index 027649e..0000000
--- a/doc/kcontrol/performance/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/performance)
diff --git a/doc/kcontrol/performance/index.docbook b/doc/kcontrol/performance/index.docbook
deleted file mode 100644
index 3534dc0..0000000
--- a/doc/kcontrol/performance/index.docbook
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article id="performance" lang="&language;">
-<articleinfo>
-<title>Performance</title>
-<authorgroup>
-<author>&Mike.McBride; &Mike.McBride.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2009-11-24</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>Systemsettings</keyword>
-<keyword>performance</keyword>
-<keyword>preload</keyword>
-</keywordset>
-</articleinfo>
-
-<sect1 id="sys-performance">
-<title>Performance Settings</title>
-
-<para>&kde;, is used on a wide variety of computers by a wide variety of users. Under the category of
-performance, this dialog allows each user to adjust options which may make the computer that &konqueror; is
-installed on feel more responsive. </para>
-
-<sect2><title>&konqueror; instances</title>
-<para>The first section of this dialog is labeled <guilabel>Minimize Memory Usage</guilabel> and has three options which determine maximum number of instances of &konqueror; that can be open on one machine at any one time.</para>
-
-<note><para>Do not confuse &konqueror; instances, with &konqueror; windows or tabs. The number of &konqueror; instances is determined by &kde; not by the user. You can think of instances as the hidden data of your &konqueror; windows and tabs. One &konqueror; instance can contain the data for multiple windows or tabs. Your choice on the following radio buttons does not limit the number of windows you can open at one time, but rather, how many instances of &konqueror; you can have open. </para>
-<para>The reason the choices you make in this dialog box are important is evident when something goes wrong and &konqueror; is forced to close an instance. <emphasis>All &konqueror; windows associated with a &konqueror; instance must be closed immediatly (without time to save data or bookmark locations).</emphasis> Therefore, the more instances you can have open at one time, the less likely a problem in one instance will affect all of your work. Each instance requires more memory which can be a problem on systems with less system memory. </para></note>
-
-<para>Your options are:</para>
-
-<variablelist>
-<varlistentry>
-<term><guilabel>Never</guilabel></term>
-<listitem><para>There are no restraints. Any number of &konqueror; instances can be open at any one time. The advantage of this option is if any &konqueror; instance crashes the remaining will be unaffected. The disadvantage is that each &konqueror; instance uses more memory.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>For file browsing only (recommended)</guilabel></term>
-<listitem><para>If this option is selected, you can have as many as you want &konqueror; instances open that are browsing the web, but only one instance of &konqueror; for file management. </para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Always (use with care)</guilabel></term>
-<listitem><para>If this option is selected, you can only have one instance of &konqueror; running at any one time. This saves system memory, but if your &konqueror; window crashes, all your browsing windows close immediatly without warning. This should only be used for seriously memory limited systems.</para></listitem>
-</varlistentry>
-</variablelist>
-</sect2>
-
-<sect2><title>Preloading</title>
-<para>The subsection labeled <guilabel>Preloading</guilabel> also makes a tradeoff between memory and performance.</para>
-
-<para><emphasis>Preloading</emphasis> refers to loading an instance of &konqueror; into memory before a user asks to start &konqueror;. The positive effect of this is that when a user asks &kde; to load &konqueror; the window appears instantly
- because most of the application has been preloaded. The negative effect is that this instance of &konqueror; uses memory that
-could be used by other programs. By default, when a user closes &konqueror;, &kde; does not close the instance.
-This means that the next time a user wants &konqueror; loaded, it is nearly instantaneous again.</para>
-<para>The spinbox labeled <guilabel>Maximum number of instances kept preloaded:</guilabel> can be used to adjust the maximum number of preloaded instances. This option does not affect instances when they are loaded. It also does not limit the number of instances that can be used by active windows. It only affects the number of preloaded instances.</para>
-<para>The check box labeled <guilabel>Preload an instance after &kde; startup</guilabel> does just what it says. It tells
-&kde; to preload one instance of &konqueror; at the startup of &kde;.</para>
-<note><para>This does extend the startup time for &kde;.</para></note>
-<para>The final check box labeled <guilabel>Always try to have at least one preloaded instance</guilabel> signals to &kde; that you always want &kde; to have one preloaded, but not used, instance of &konqueror; available. This option will actually decrease performance on some machines (especially those with limited physical memory).</para>
-</sect2>
-<!-- not in kde4
-<sect2><title>&kde; system performance options</title>
-<para>Click on the tab labeled <guilabel>System</guilabel>.</para>
-<para>Currently there is only one option labeled <guilabel>Disable system configuration startup check</guilabel>.
-</para>
-<para>When &kde; starts, it checks several directories for changes to configuration. Most of these changes relate to installation and uninstalling applications to the computer. This scan extends the startup time for &kde; and many times this scan is not needed as the configuration is current from the last time &kde; was started. When the configuration has changed &kde; uses this scan to update various datafiles to ensure a smooth user experience. </para>
-<warning><para>You are given the option to skip this initial scan during startup. &kde; developers strongly suggest you do not disable this scan because of the potential to introduce instability into your system.</para>
-<para>If you do select this option:</para>
-<itemizedlist>
-<listitem><para>&kde; will wait to perform the scan until after &kde; has started. This scan will be performed after the desktop is loaded.</para></listitem>
-<listitem><para>In the event of a crash, &kde; will not perform a backtrace because your problem may be related to the delayed scan.</para></listitem>
-<listitem><para>Switch this option off if any application is crashing as a delayed scan may be responsible for the crash.</para></listitem>
-</itemizedlist>
-</warning>
-</sect2>
--->
-</sect1>
-
-</article>
diff --git a/doc/kcontrol5/CMakeLists.txt b/doc/kcontrol5/CMakeLists.txt
new file mode 100644
index 0000000..95e4464
--- /dev/null
+++ b/doc/kcontrol5/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_subdirectory( bookmarks )
+add_subdirectory( filemanager )
+#add_subdirectory( history ) commented from build like the code in sidebar/history_module
+add_subdirectory( kcmcss )
+add_subdirectory( khtml-adblock )
+add_subdirectory( khtml-behavior )
+add_subdirectory( khtml-general )
+add_subdirectory( khtml-java-js )
+add_subdirectory( performance )
diff --git a/doc/kcontrol5/bookmarks/CMakeLists.txt b/doc/kcontrol5/bookmarks/CMakeLists.txt
new file mode 100644
index 0000000..c6f28c5
--- /dev/null
+++ b/doc/kcontrol5/bookmarks/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/bookmarks)
diff --git a/doc/kcontrol/bookmarks/index.docbook b/doc/kcontrol5/bookmarks/index.docbook
similarity index 94%
rename from doc/kcontrol/bookmarks/index.docbook
rename to doc/kcontrol5/bookmarks/index.docbook
index 9f32fc4..bb45908 100644
--- a/doc/kcontrol/bookmarks/index.docbook
+++ b/doc/kcontrol5/bookmarks/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 -->
]>
@@ -17,12 +17,13 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2010-09-24</date>
-<releaseinfo>0.2 (&kde; 4.5)</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
<keyword>KControl</keyword>
+<keyword>systemsettings</keyword>
<keyword>bookmarks</keyword>
<keyword>KIO</keyword>
</keywordset>
diff --git a/doc/kcontrol5/filemanager/CMakeLists.txt b/doc/kcontrol5/filemanager/CMakeLists.txt
new file mode 100644
index 0000000..d667c59
--- /dev/null
+++ b/doc/kcontrol5/filemanager/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/filemanager)
diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol5/filemanager/index.docbook
similarity index 92%
rename from doc/kcontrol/filemanager/index.docbook
rename to doc/kcontrol5/filemanager/index.docbook
index 0f638d5..76f5f7e 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol5/filemanager/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-12-18</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/doc/kcontrol5/history/CMakeLists.txt b/doc/kcontrol5/history/CMakeLists.txt
new file mode 100644
index 0000000..b4ec7e7
--- /dev/null
+++ b/doc/kcontrol5/history/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/history)
diff --git a/doc/kcontrol/history/index.docbook b/doc/kcontrol5/history/index.docbook
similarity index 95%
rename from doc/kcontrol/history/index.docbook
rename to doc/kcontrol5/history/index.docbook
index ffc074d..27f805c 100644
--- a/doc/kcontrol/history/index.docbook
+++ b/doc/kcontrol5/history/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">
]>
diff --git a/doc/kcontrol5/kcmcss/CMakeLists.txt b/doc/kcontrol5/kcmcss/CMakeLists.txt
new file mode 100644
index 0000000..eeaa903
--- /dev/null
+++ b/doc/kcontrol5/kcmcss/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/kcmcss)
diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol5/kcmcss/index.docbook
similarity index 98%
rename from doc/kcontrol/kcmcss/index.docbook
rename to doc/kcontrol5/kcmcss/index.docbook
index 050a72a..5fb737d 100644
--- a/doc/kcontrol/kcmcss/index.docbook
+++ b/doc/kcontrol5/kcmcss/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-12-01</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -161,7 +161,7 @@ vision.</para>
<para>Your choices here affect every &kde; application that renders HTML
with &kde;'s own renderer, which is called khtml. These include
&kmail;, &khelpcenter; and of course &konqueror;. Choices here do not
-affect other browsers such as &Netscape;.</para>
+affect other browsers such as &firefox;.</para>
</sect3>
diff --git a/doc/kcontrol5/khtml-adblock/CMakeLists.txt b/doc/kcontrol5/khtml-adblock/CMakeLists.txt
new file mode 100644
index 0000000..bc34e36
--- /dev/null
+++ b/doc/kcontrol5/khtml-adblock/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/khtml-adblock)
diff --git a/doc/kcontrol/khtml-adblock/index.docbook b/doc/kcontrol5/khtml-adblock/index.docbook
similarity index 91%
rename from doc/kcontrol/khtml-adblock/index.docbook
rename to doc/kcontrol5/khtml-adblock/index.docbook
index e153d5f..d588409 100644
--- a/doc/kcontrol/khtml-adblock/index.docbook
+++ b/doc/kcontrol5/khtml-adblock/index.docbook
@@ -1,7 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY nsplugins-kcontrol SYSTEM "nsplugin.docbook">
+<!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 +13,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2011-11-22</date>
-<releaseinfo>&kde; 4.8</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
</articleinfo>
<para>&konqueror; AdBlocK can be configured to replace or remove
@@ -37,9 +36,6 @@ URLs that will be compared against image and frame names to decide
on fitlering actions. The wildcards can be given as filename style
regular expressions.</para>
-<para>Use the <guilabel>Search</guilabel> edit box above the list box
-to filter matching entries an the fly.</para>
-
<para>Each filter can either be expressed as a file style wildcard
string (e.g. http://www.site.com/ads/*) or as a full regular expression
by enclosing the filter with forward slashes (e.g. //(ads|dclk)\./).</para>
diff --git a/doc/kcontrol5/khtml-behavior/CMakeLists.txt b/doc/kcontrol5/khtml-behavior/CMakeLists.txt
new file mode 100644
index 0000000..c61133f
--- /dev/null
+++ b/doc/kcontrol5/khtml-behavior/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/khtml-behavior)
diff --git a/doc/kcontrol/khtml-behavior/index.docbook b/doc/kcontrol5/khtml-behavior/index.docbook
similarity index 94%
rename from doc/kcontrol/khtml-behavior/index.docbook
rename to doc/kcontrol5/khtml-behavior/index.docbook
index f101fea..d87dd9d 100644
--- a/doc/kcontrol/khtml-behavior/index.docbook
+++ b/doc/kcontrol5/khtml-behavior/index.docbook
@@ -1,7 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY nsplugins-kcontrol SYSTEM "nsplugin.docbook">
+<!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 +13,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2011-11-11</date>
-<releaseinfo>&kde; 4.10</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/doc/kcontrol5/khtml-general/CMakeLists.txt b/doc/kcontrol5/khtml-general/CMakeLists.txt
new file mode 100644
index 0000000..132f198
--- /dev/null
+++ b/doc/kcontrol5/khtml-general/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/khtml-general)
diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol5/khtml-general/index.docbook
similarity index 89%
rename from doc/kcontrol/khtml-general/index.docbook
rename to doc/kcontrol5/khtml-general/index.docbook
index 70c14f0..d105432 100644
--- a/doc/kcontrol/khtml-general/index.docbook
+++ b/doc/kcontrol5/khtml-general/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>2011-11-22</date>
-<releaseinfo>&kde; 4.8</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
</articleinfo>
<para>On this page you find settings for home and start page and the behavior
@@ -44,16 +44,6 @@ button in the toolbar is replaced by a <guilabel>Home Folder</guilabel> button
which makes it jump to your local home folder instead.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term><guilabel>Default web browser engine</guilabel></term>
-<listitem><para>
-This option provides an easy way to select the preferred web engine in &konqueror;, either
-<guilabel>KHTML</guilabel> or <guilabel>Webkit</guilabel>, if installed.
-Using the <menuchoice><guimenu>View</guimenu><guimenuitem>View Mode</guimenuitem></menuchoice>
-menu allows you to change the web engine temporarily on the fly.
-</para>
-</listitem>
-</varlistentry>
<varlistentry>
<term><guilabel>Open links in
diff --git a/doc/kcontrol5/khtml-java-js/CMakeLists.txt b/doc/kcontrol5/khtml-java-js/CMakeLists.txt
new file mode 100644
index 0000000..1eb9379
--- /dev/null
+++ b/doc/kcontrol5/khtml-java-js/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/khtml-java-js)
diff --git a/doc/kcontrol/khtml-java-js/index.docbook b/doc/kcontrol5/khtml-java-js/index.docbook
similarity index 96%
rename from doc/kcontrol/khtml-java-js/index.docbook
rename to doc/kcontrol5/khtml-java-js/index.docbook
index 0b0e5da..bee23d1 100644
--- a/doc/kcontrol/khtml-java-js/index.docbook
+++ b/doc/kcontrol5/khtml-java-js/index.docbook
@@ -1,7 +1,6 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
-<!ENTITY nsplugins-kcontrol SYSTEM "nsplugin.docbook">
+<!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 +13,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2009-11-24</date>
-<releaseinfo>&kde; 4.4</releaseinfo>
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/doc/kcontrol5/performance/CMakeLists.txt b/doc/kcontrol5/performance/CMakeLists.txt
new file mode 100644
index 0000000..ad628f9
--- /dev/null
+++ b/doc/kcontrol5/performance/CMakeLists.txt
@@ -0,0 +1,2 @@
+########### install files ###############
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/performance)
diff --git a/doc/kcontrol5/performance/index.docbook b/doc/kcontrol5/performance/index.docbook
new file mode 100644
index 0000000..5c38249
--- /dev/null
+++ b/doc/kcontrol5/performance/index.docbook
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<!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 -->
+]>
+
+<article id="performance" lang="&language;">
+<articleinfo>
+<title>Performance</title>
+<authorgroup>
+<author>&Mike.McBride; &Mike.McBride.mail;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>2016-11-08</date>
+<releaseinfo>Applications 16.12</releaseinfo>
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>Systemsettings</keyword>
+<keyword>performance</keyword>
+<keyword>preload</keyword>
+</keywordset>
+</articleinfo>
+
+<sect1 id="sys-performance">
+<title>Performance Settings</title>
+
+<para>&konqueror;, is used on a wide variety of computers by a wide variety of users. Under the category of
+performance, this dialog allows each user to adjust options which may make the computer that &konqueror; is
+installed on feel more responsive. </para>
+
+<sect2><title>Preloading</title>
+<para>The subsection labeled <guilabel>Preloading</guilabel> makes a tradeoff between memory and performance.</para>
+
+<para><emphasis>Preloading</emphasis> refers to loading an instance of &konqueror; into memory before a user asks to start &konqueror;. The positive effect of this is that when a user asks to load &konqueror; the window appears instantly
+ because most of the application has been preloaded. The negative effect is that this instance of &konqueror; uses memory that
+could be used by other programs. By default, when a user closes &konqueror;, the instance is not closed.
+This means that the next time a user wants &konqueror; loaded, it is nearly instantaneous again.</para>
+
+<para>The final check box labeled <guilabel>Always try to have at least one preloaded instance</guilabel> signals that you always want to have one preloaded, but not used, instance of &konqueror; available. This option will actually decrease performance on some machines (especially those with limited physical memory).</para>
+</sect2>
+</sect1>
+
+</article>
diff --git a/doc/man-kbookmarkmerger.1.docbook b/doc/man-kbookmarkmerger.1.docbook
index 9364bad..6723611 100644
--- a/doc/man-kbookmarkmerger.1.docbook
+++ b/doc/man-kbookmarkmerger.1.docbook
@@ -12,8 +12,9 @@
&Frerich.Raabe;
&Frerich.Raabe.mail;
</author>
- <date>February 1st, 2005</date>
- <productname>kbookmarkmerger</productname>
+ <date>2016-11-07</date>
+ <releaseinfo>Applications 16.12</releaseinfo>
+ <productname>KDE Applications</productname>
</refentryinfo>
<refmeta>
@@ -30,8 +31,6 @@
<refsynopsisdiv>
<cmdsynopsis>
&kbookmarkmerger;
- <arg choice="opt" rep="repeat">Qt Options</arg>
- <arg choice="opt" rep="repeat">KDE Options</arg>
<arg choice="req">directory</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -72,7 +71,10 @@ files.</para>
<refsect1>
<title>See Also</title>
-<para><ulink url="help:/konqueror/index.html">&konqueror; manual</ulink></para>
+<simplelist>
+<member><ulink url="help:/konqueror/index.html">&konqueror; manual</ulink></member>
+<member>kf5options(7)</member>
+</simplelist>
</refsect1>
<refsect1>
diff --git a/settings/bookmarks/bookmarks.desktop b/settings/bookmarks/bookmarks.desktop
index 676e5e6..8b5090e 100644
--- a/settings/bookmarks/bookmarks.desktop
+++ b/settings/bookmarks/bookmarks.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/bookmarks/index.html
+X-DocPath=kcontrol5/bookmarks/index.html
Icon=bookmarks
Exec=kcmshell5 bookmarks
diff --git a/settings/konq/filebehavior.desktop b/settings/konq/filebehavior.desktop
index ee0139c..405d7d9 100644
--- a/settings/konq/filebehavior.desktop
+++ b/settings/konq/filebehavior.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol5/filemanager/index.html
Icon=system-file-manager
Exec=kcmshell5 filebehavior
diff --git a/settings/konqhtml/khtml_behavior.desktop b/settings/konqhtml/khtml_behavior.desktop
index 5d354c8..f1ee441 100644
--- a/settings/konqhtml/khtml_behavior.desktop
+++ b/settings/konqhtml/khtml_behavior.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/khtml-behavior/index.html
+X-DocPath=kcontrol5/khtml-behavior/index.html
Icon=konqueror
Exec=kcmshell5 khtml_behavior
X-KDE-ParentApp=kcontrol
diff --git a/settings/konqhtml/khtml_filter.desktop b/settings/konqhtml/khtml_filter.desktop
index 50d508f..81fcc20 100644
--- a/settings/konqhtml/khtml_filter.desktop
+++ b/settings/konqhtml/khtml_filter.desktop
@@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/khtml-adblock/index.html
+X-DocPath=kcontrol5/khtml-adblock/index.html
Icon=preferences-web-browser-adblock
Exec=kcmshell5 khtml_filter
diff --git a/settings/konqhtml/khtml_general.desktop b/settings/konqhtml/khtml_general.desktop
index 342ba92..dd3313b 100644
--- a/settings/konqhtml/khtml_general.desktop
+++ b/settings/konqhtml/khtml_general.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/khtml-general/index.html
+X-DocPath=kcontrol5/khtml-general/index.html
Icon=konqueror
Exec=kcmshell5 khtml_general
X-KDE-ParentApp=kcontrol
diff --git a/settings/konqhtml/khtml_java_js.desktop b/settings/konqhtml/khtml_java_js.desktop
index f7e5b4c..441f326 100644
--- a/settings/konqhtml/khtml_java_js.desktop
+++ b/settings/konqhtml/khtml_java_js.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol/khtml-java-js/index.html
+X-DocPath=kcontrol5/khtml-java-js/index.html
Icon=java
Exec=kcmshell5 khtml_java_js
X-KDE-ParentApp=kcontrol
diff --git a/sidebar/history_module/kcmhistory.desktop b/sidebar/history_module/kcmhistory.desktop
index db93e15..b7b63ca 100644
--- a/sidebar/history_module/kcmhistory.desktop
+++ b/sidebar/history_module/kcmhistory.desktop
@@ -6,7 +6,7 @@ Exec=kcmshell5 kcmhistory
X-KDE-Library=kcm_history
X-KDE-ParentApp=kcontrol
-X-DocPath=kcontrol/history/index.html
+X-DocPath=kcontrol5/history/index.html
Name=History
Name[af]=Geskiedenis
More information about the kde-doc-english
mailing list