diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@
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( 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/doc/kcontrol/performance/index.docbook
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-]>
-
-
-
-Performance
-
-&Mike.McBride; &Mike.McBride.mail;
-
-
-
-2009-11-24
-&kde; 4.4
-
-
-KDE
-Systemsettings
-performance
-preload
-
-
-
-
-Performance Settings
-
-&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.
-
-&konqueror; instances
-The first section of this dialog is labeled Minimize Memory Usage and has three options which determine maximum number of instances of &konqueror; that can be open on one machine at any one time.
-
-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.
-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. All &konqueror; windows associated with a &konqueror; instance must be closed immediatly (without time to save data or bookmark locations). 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.
-
-Your options are:
-
-
-
-Never
-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.
-
-
-
-For file browsing only (recommended)
-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.
-
-
-
-Always (use with care)
-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.
-
-
-
-
-Preloading
-The subsection labeled Preloading also makes a tradeoff between memory and performance.
-
-Preloading 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.
-The spinbox labeled Maximum number of instances kept preloaded: 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.
-The check box labeled Preload an instance after &kde; startup does just what it says. It tells
-&kde; to preload one instance of &konqueror; at the startup of &kde;.
-This does extend the startup time for &kde;.
-The final check box labeled Always try to have at least one preloaded instance 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).
-
-
-
-
-
diff --git a/doc/kcontrol5/CMakeLists.txt b/doc/kcontrol5/CMakeLists.txt
new file mode 100644
--- /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
--- /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
rename from doc/kcontrol/bookmarks/index.docbook
rename to doc/kcontrol5/bookmarks/index.docbook
--- a/doc/kcontrol/bookmarks/index.docbook
+++ b/doc/kcontrol5/bookmarks/index.docbook
@@ -1,6 +1,6 @@
-
]>
@@ -17,12 +17,13 @@
-2010-09-24
-0.2 (&kde; 4.5)
+2016-11-08
+Applications 16.12
KDE
KControl
+systemsettings
bookmarks
KIO
diff --git a/doc/kcontrol5/filemanager/CMakeLists.txt b/doc/kcontrol5/filemanager/CMakeLists.txt
new file mode 100644
--- /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
rename from doc/kcontrol/filemanager/index.docbook
rename to doc/kcontrol5/filemanager/index.docbook
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol5/filemanager/index.docbook
@@ -1,6 +1,6 @@
-
]>
@@ -13,8 +13,8 @@
-2009-12-18
-&kde; 4.4
+2016-11-08
+Applications 16.12
KDE
diff --git a/doc/kcontrol5/history/CMakeLists.txt b/doc/kcontrol5/history/CMakeLists.txt
new file mode 100644
--- /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
rename from doc/kcontrol/history/index.docbook
rename to doc/kcontrol5/history/index.docbook
--- a/doc/kcontrol/history/index.docbook
+++ b/doc/kcontrol5/history/index.docbook
@@ -1,6 +1,6 @@
-
]>
diff --git a/doc/kcontrol5/kcmcss/CMakeLists.txt b/doc/kcontrol5/kcmcss/CMakeLists.txt
new file mode 100644
--- /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
rename from doc/kcontrol/kcmcss/index.docbook
rename to doc/kcontrol5/kcmcss/index.docbook
--- a/doc/kcontrol/kcmcss/index.docbook
+++ b/doc/kcontrol5/kcmcss/index.docbook
@@ -1,6 +1,6 @@
-
]>
@@ -13,8 +13,8 @@
-2009-12-01
-&kde; 4.4
+2016-11-08
+Applications 16.12
KDE
@@ -161,7 +161,7 @@
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;.
+affect other browsers such as &firefox;.
diff --git a/doc/kcontrol5/khtml-adblock/CMakeLists.txt b/doc/kcontrol5/khtml-adblock/CMakeLists.txt
new file mode 100644
--- /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
rename from doc/kcontrol/khtml-adblock/index.docbook
rename to doc/kcontrol5/khtml-adblock/index.docbook
--- a/doc/kcontrol/khtml-adblock/index.docbook
+++ b/doc/kcontrol5/khtml-adblock/index.docbook
@@ -1,7 +1,6 @@
-
+
]>
@@ -14,8 +13,8 @@
-2011-11-22
-&kde; 4.8
+2016-11-08
+Applications 16.12
&konqueror; AdBlocK can be configured to replace or remove
@@ -37,9 +36,6 @@
on fitlering actions. The wildcards can be given as filename style
regular expressions.
-Use the Search edit box above the list box
-to filter matching entries an the fly.
-
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)\./).
diff --git a/doc/kcontrol5/khtml-behavior/CMakeLists.txt b/doc/kcontrol5/khtml-behavior/CMakeLists.txt
new file mode 100644
--- /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
rename from doc/kcontrol/khtml-behavior/index.docbook
rename to doc/kcontrol5/khtml-behavior/index.docbook
--- a/doc/kcontrol/khtml-behavior/index.docbook
+++ b/doc/kcontrol5/khtml-behavior/index.docbook
@@ -1,7 +1,6 @@
-
+
]>
@@ -14,8 +13,8 @@
-2011-11-11
-&kde; 4.10
+2016-11-08
+Applications 16.12
KDE
diff --git a/doc/kcontrol5/khtml-general/CMakeLists.txt b/doc/kcontrol5/khtml-general/CMakeLists.txt
new file mode 100644
--- /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
rename from doc/kcontrol/khtml-general/index.docbook
rename to doc/kcontrol5/khtml-general/index.docbook
--- a/doc/kcontrol/khtml-general/index.docbook
+++ b/doc/kcontrol5/khtml-general/index.docbook
@@ -1,6 +1,6 @@
-
]>
@@ -14,8 +14,8 @@
-2011-11-22
-&kde; 4.8
+2016-11-08
+Applications 16.12
On this page you find settings for home and start page and the behavior
@@ -44,16 +44,6 @@
which makes it jump to your local home folder instead.
-
-Default web browser engine
-
-This option provides an easy way to select the preferred web engine in &konqueror;, either
-KHTML or Webkit, if installed.
-Using the ViewView Mode
-menu allows you to change the web engine temporarily on the fly.
-
-
-
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
--- /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
rename from doc/kcontrol/khtml-java-js/index.docbook
rename to doc/kcontrol5/khtml-java-js/index.docbook
--- a/doc/kcontrol/khtml-java-js/index.docbook
+++ b/doc/kcontrol5/khtml-java-js/index.docbook
@@ -1,7 +1,6 @@
-
+
]>
@@ -14,8 +13,8 @@
-2009-11-24
-&kde; 4.4
+2016-11-08
+Applications 16.12
KDE
diff --git a/doc/kcontrol5/performance/CMakeLists.txt b/doc/kcontrol5/performance/CMakeLists.txt
new file mode 100644
--- /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
--- /dev/null
+++ b/doc/kcontrol5/performance/index.docbook
@@ -0,0 +1,46 @@
+
+
+
+]>
+
+
+
+Performance
+
+&Mike.McBride; &Mike.McBride.mail;
+
+
+
+2016-11-08
+Applications 16.12
+
+
+KDE
+Systemsettings
+performance
+preload
+
+
+
+
+Performance Settings
+
+&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.
+
+Preloading
+The subsection labeled Preloading makes a tradeoff between memory and performance.
+
+Preloading 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.
+
+The final check box labeled Always try to have at least one preloaded instance 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).
+
+
+
+
diff --git a/doc/man-kbookmarkmerger.1.docbook b/doc/man-kbookmarkmerger.1.docbook
--- a/doc/man-kbookmarkmerger.1.docbook
+++ b/doc/man-kbookmarkmerger.1.docbook
@@ -12,8 +12,9 @@
&Frerich.Raabe;
&Frerich.Raabe.mail;
- February 1st, 2005
- kbookmarkmerger
+ 2016-11-07
+ Applications 16.12
+ KDE Applications
@@ -30,8 +31,6 @@
&kbookmarkmerger;
- Qt Options
- KDE Options
directory
@@ -72,7 +71,10 @@
See Also
-&konqueror; manual
+
+&konqueror; manual
+kf5options(7)
+
diff --git a/settings/bookmarks/bookmarks.desktop b/settings/bookmarks/bookmarks.desktop
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sidebar/history_module/kcmhistory.desktop
+++ b/sidebar/history_module/kcmhistory.desktop
@@ -6,7 +6,7 @@
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