[plasma-desktop] doc/kcontrol: remove kcm docbooks which have their code in other repos from plasma-desktop
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-1doc/kcontrol/cache/index.docbook M +1-1doc/kcontrol/cookies/index.docbook M +1-2doc/kcontrol/filetypes/index.docbook M +1-1doc/kcontrol/netpref/index.docbook M +1-1doc/kcontrol/proxy/index.docbook M +1-1doc/kcontrol/smb/index.docbook M +2-2doc/kcontrol/useragent/index.docbook M +1-1doc/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 @@ ]> - + Cache 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 @@ ]> - + Cookies 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 @@ Calligra Words"> ]> - + 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 @@ ]> - + Connection Preferences 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 @@ ]> - + Proxy 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 @@ ]> - + Windows Shares 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 @@ ]> - + Browser Identification @@ -107,4 +107,4 @@ displayed in bold text at the top of the page. - \ No newline at end of file + 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 @@ ]> - + Web Shortcuts
[konqueror] doc: move konqueror docs into subdir doc/konqueror so scripty can process them properly
Git commit 1d72cb3209ade07f07c3e1ef787726976e6da735 by Burkhard Lück.
Committed on 12/11/2016 at 23:12.
Pushed by lueck into branch 'master'.
move konqueror docs into subdir doc/konqueror so scripty can process them
properly
M +1-2doc/CMakeLists.txt
C +1-2doc/konqueror/CMakeLists.txt [from: doc/CMakeLists.txt - 089%
similarity]
R +---doc/konqueror/cmndline.png [from: doc/cmndline.png - 100%
similarity]
R +---doc/konqueror/dirtree.png [from: doc/dirtree.png - 100%
similarity]
R +---doc/konqueror/dragdrop.png [from: doc/dragdrop.png - 100%
similarity]
R +---doc/konqueror/folders.png [from: doc/folders.png - 100%
similarity]
R +---doc/konqueror/format-font-size-less.png [from:
doc/format-font-size-less.png - 100% similarity]
R +---doc/konqueror/format-font-size-more.png [from:
doc/format-font-size-more.png - 100% similarity]
R +---doc/konqueror/go-jump.png [from: doc/go-jump.png - 100%
similarity]
R +---doc/konqueror/grouping-view.png [from: doc/grouping-view.png -
100% similarity]
R +0-0doc/konqueror/index.docbook [from: doc/index.docbook - 100%
similarity]
R +---doc/konqueror/konqorg.png [from: doc/konqorg.png - 100%
similarity]
R +---doc/konqueror/look.png [from: doc/look.png - 100% similarity]
R +0-0doc/konqueror/man-kbookmarkmerger.1.docbook [from:
doc/man-kbookmarkmerger.1.docbook - 100% similarity]
R +---doc/konqueror/parts.png [from: doc/parts.png - 100% similarity]
R +---doc/konqueror/reset.png [from: doc/reset.png - 100% similarity]
R +---doc/konqueror/thumbnails.png [from: doc/thumbnails.png - 100%
similarity]
R +---doc/konqueror/viewproperties-dialog.png [from:
doc/viewproperties-dialog.png - 100% similarity]
http://commits.kde.org/konqueror/1d72cb3209ade07f07c3e1ef787726976e6da735
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 1bc7490..daf11ad 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -2,5 +2,4 @@
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})
+add_subdirectory( konqueror )
diff --git a/doc/CMakeLists.txt b/doc/konqueror/CMakeLists.txt
similarity index 89%
copy from doc/CMakeLists.txt
copy to doc/konqueror/CMakeLists.txt
index 1bc7490..bce3532 100644
--- a/doc/CMakeLists.txt
+++ b/doc/konqueror/CMakeLists.txt
@@ -1,6 +1,5 @@
### install files ###
-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/cmndline.png b/doc/konqueror/cmndline.png
similarity index 100%
rename from doc/cmndline.png
rename to doc/konqueror/cmndline.png
diff --git a/doc/dirtree.png b/doc/konqueror/dirtree.png
similarity index 100%
rename from doc/dirtree.png
rename to doc/konqueror/dirtree.png
diff --git a/doc/dragdrop.png b/doc/konqueror/dragdrop.png
similarity index 100%
rename from doc/dragdrop.png
rename to doc/konqueror/dragdrop.png
diff --git a/doc/folders.png b/doc/konqueror/folders.png
similarity index 100%
rename from doc/folders.png
rename to doc/konqueror/folders.png
diff --git a/doc/format-font-size-less.png
b/doc/konqueror/format-font-size-less.png
similarity index 100%
rename from doc/format-font-size-less.png
rename to doc/konqueror/format-font-size-less.png
diff --git a/doc/format-font-size-more.png
b/doc/konqueror/format-font-size-more.png
similarity index 100%
rename from doc/format-font-size-more.png
rename to doc/konqueror/format-font-size-more.png
diff --git a/doc/go-jump.png b/doc/konqueror/go-jump.png
similarity index 100%
rename from doc/go-jump.png
rename to doc/konqueror/go-jump.png
diff --git a/doc/grouping-view.png b/doc/konqueror/grouping-view.png
similarity index 100%
rename from doc/grouping-view.png
rename to doc/konqueror/grouping-view.png
diff --git a/doc/index.docbook b/doc/konqueror/index.docbook
similarity index 100%
rename from doc/index.docbook
rename to doc/konqueror/index.docbook
diff --git a/doc/konqorg.png b/doc/konqueror/konqorg.png
similarity index 100%
rename from doc/konqorg.png
rename to doc/konqueror/konqorg.png
diff --git a/doc/look.png b/doc/konqueror/look.png
similarity index 100%
rename from doc/look.png
rename to doc/konqueror/look.png
diff --git a/doc/man-kbookmarkmerger.1.docbook
b/doc/konqueror/man-kbookmarkmerger.1.docbook
similarity index 100%
rename from doc/man-kbookmarkmerger.1.docbook
rename to doc/konqueror/man-kbookmarkmerger.1.docbook
diff --git a/doc/parts.png b/doc/konqueror/parts.png
similarity index 100%
rename from doc/parts.png
rename to doc/konqueror/parts.png
diff --git a/doc/reset.png b/doc/konqueror/reset.png
[kio] doc/kcontrol/ebrowsing: doc fixes found while translating
Git commit 6c4c96e558fb5967562c7b0a20b6babbdb7a5fae by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. doc fixes found while translating svn path=/trunk/KDE/kdebase/runtime/; revision=1072268 M +2-3doc/kcontrol/ebrowsing/index.docbook http://commits.kde.org/kio/6c4c96e558fb5967562c7b0a20b6babbdb7a5fae diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index f9c99c4..911f94d 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -67,8 +67,7 @@ input is not properly encoded, so one will type shortcuts wherever you would normally use s. Shortcuts for several search engines should already be configured on your system, but you can add new keywords, and -change or delete existing ones in the enhanced browsing control -module. +change or delete existing ones in this module. @@ -163,4 +162,4 @@ navigation in . - \ No newline at end of file +
[kio] doc/kcontrol/ebrowsing: fix typos and add missing text
Git commit 8ef7983f919d94ef786221c2030568a8f1f28ca4 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. fix typos and add missing text svn path=/trunk/KDE/kdebase/runtime/; revision=1057484 M +1-1doc/kcontrol/ebrowsing/index.docbook http://commits.kde.org/kio/8ef7983f919d94ef786221c2030568a8f1f28ca4 diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index 064451d..f9c99c4 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -94,7 +94,7 @@ lookup services when you type in normal words and phrases instead of a . To disable this feature select None from the list. -Default search engine +Keyword delimiter Choose the delimiter that separates the keyword from the phrase or word to be searched.
[kio] doc/kcontrol/proxy: Fix typos, use entity.
Git commit f7e7878751dcd06a4e4acb2d744de049c458ef19 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. Fix typos, use entity. M +4-4doc/kcontrol/proxy/index.docbook http://commits.kde.org/kio/f7e7878751dcd06a4e4acb2d744de049c458ef19 diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index ca93d1d..524d0df 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -120,10 +120,10 @@ the Auto Detect button to provide the environment variable names used to set the address of the proxy server(s). In the Exceptions field enter the environment variable, -e.g. $NO_PROXY, used to store the + $NO_PROXY, used to store the addresses of sites for which the proxy server should not be used. Use Show the value of the environment variables to -show the value of an environment variable istead of its name. +show the value of an environment variable instead of its name. However it is not possible to edit the values of environment variables in this module.
[kio] doc/kcontrol/ebrowsing: \{@} is four chars not two
Git commit 83ed5935df48286bc79db926311cd6c2a041dbe5 by Burkhard Lück, on behalf
of Albert Astals Cid.
Committed on 09/11/2016 at 07:04.
Pushed by lueck into branch 'master'.
\{@} is four chars not two
Warned by Freek de Kruijf
M +1-1doc/kcontrol/ebrowsing/index.docbook
http://commits.kde.org/kio/83ed5935df48286bc79db926311cd6c2a041dbe5
diff --git a/doc/kcontrol/ebrowsing/index.docbook
b/doc/kcontrol/ebrowsing/index.docbook
index 74c2964..0376cb0 100644
--- a/doc/kcontrol/ebrowsing/index.docbook
+++ b/doc/kcontrol/ebrowsing/index.docbook
@@ -126,7 +126,7 @@ changes.
If you examine the contents of the Shortcuts
URL text box, you will find that most, if not all of the
-entries have a \{@} in them. This sequence of two
+entries have a \{@} in them. This sequence of four
characters acts as a parameter, which is to say that they are replaced
by whatever you happen to type after the colon character that is
between a shortcut and its parameter. Let's consider some examples to
[kio] doc/kcontrol/proxy: doc update for proxy kcm
Git commit efea37dc22465f35618a6b03e98d16aa8b89275b by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. doc update for proxy kcm @ Dawit Alemayehu: please review, thanks CCMAIL:ada...@kde.org M +38 -19 doc/kcontrol/proxy/index.docbook http://commits.kde.org/kio/efea37dc22465f35618a6b03e98d16aa8b89275b diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index bf1f9ea..8e27ac3 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -13,8 +13,8 @@ -2009-11-18 - 4.4 +2011-11-21 + 4.8 KDE @@ -67,10 +67,11 @@ service provider's setup guide or your system administrator. -Connect to the Internet directly +No Proxy -Select this option if you do not want to use a proxy server. +Select this option if you do not want to use a proxy server +and connect to the Internet directly. @@ -80,7 +81,7 @@ configure the settings for it. -Automatically detect proxy configuration +Detect proxy configuration automatically Select this option if you want the proxy setup configuration @@ -99,7 +100,7 @@ more information. -Use proxy configuration URL +Use proxy auto configuration URL Select this option if your proxy support is provided through a script file located at a specific address. You can then enter the @@ -109,35 +110,53 @@ icon to browse to it. -Use preset proxy environment variables +Use system proxy configuration Some systems are setup with $HTTP_PROXY to allow graphical as well as non-graphical applications to share the same proxy configuration information. If you know this applies to you, select this option and click on -the Setup... button to provide the environment +the Auto Detect button to provide the environment variable names used to set the address of the proxy server(s). + + +Exceptions + +Enter a comma separated list of hostnames or ip addresses that should +be excluded from using the above proxy settings. If you want to exclude all +hosts for a given domain, then simply enter the domain name preceded by a dot. +For example, to exclude all hostnames for kde.org, enter .kde.org. +Wildcard characters such as * or ? +are not supported and will have no effect. +Additionally, you can also enter IP addresses, e.g. 127.0.0.1 and +IP addresses with a subnet, e.g. 192.168.0.1/24. + + + -Manually specify the proxy settings +Use manually specified proxy configuration -Select this option, and click on the -Setup... to manually setup the location of the -proxy servers to be used. -If you choose this option, another dialog will pop up. + The complete addressing information for the proxy includes both the internet address and a port number. You should enter these into -the relevant text boxes. The arrow button copies +the relevant text boxes. + + -You can also choose Only use proxy for entries in this -list. +You can also choose Use proxy settings only for addresses +in the Exceptions list. Check this box to reverse the use of the exception list, the proxy servers will only be used when the requested matches @@ -152,7 +171,7 @@ script. - +
[kio] doc/kcontrol/proxy: Fix my typos.
Git commit 7e19ca8a7b3faf5b1a7bf838afb5a05c6f0d2734 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. Fix my typos. M +1-1doc/kcontrol/proxy/index.docbook http://commits.kde.org/kio/7e19ca8a7b3faf5b1a7bf838afb5a05c6f0d2734 diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index 524d0df..c6adc47 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -138,7 +138,7 @@ How to enable Auto Detect button? The complete addressing information for the proxy includes both the Internet address and a port number. You should enter these into the relevant text boxes. Check Use this proxy server for all -protocols to copy the adsresses and port of the HTTP proxy server +protocols to copy the addresses and port of the HTTP proxy server into all other proxy fields, in order to help save some typing.
[kio] doc/kcontrol/ebrowsing: bump version
Git commit 0640a553d9606b4f911b3e43d7ab90baa98637d4 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. bump version M +2-2doc/kcontrol/ebrowsing/index.docbook http://commits.kde.org/kio/0640a553d9606b4f911b3e43d7ab90baa98637d4 diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index e7f02db..63e6f69 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -14,8 +14,8 @@ -2012-11-11 - 4.10 +2013-05-30 + 4.11 KDE
[kio] doc/kcontrol: proofreading/updating/bump version of runtime kcm docs in Network and Connectivity category
Git commit 9ff55d44bed8a84d80f096ce6fd2dcca18a57604 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. proofreading/updating/bump version of runtime kcm docs in Network and Connectivity category M +2-2doc/kcontrol/netpref/index.docbook M +2-2doc/kcontrol/proxy/index.docbook M +2-2doc/kcontrol/smb/index.docbook http://commits.kde.org/kio/9ff55d44bed8a84d80f096ce6fd2dcca18a57604 diff --git a/doc/kcontrol/netpref/index.docbook b/doc/kcontrol/netpref/index.docbook index 57e5cbd..d5436bb 100644 --- a/doc/kcontrol/netpref/index.docbook +++ b/doc/kcontrol/netpref/index.docbook @@ -14,8 +14,8 @@ -2009-11-19 - 4.4 +2013-12-05 + 4.12 KDE diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index 4feef06..ec5d777 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -13,8 +13,8 @@ -2011-11-21 - 4.8 +2013-12-05 + 4.12 KDE diff --git a/doc/kcontrol/smb/index.docbook b/doc/kcontrol/smb/index.docbook index d72f4ee..70d331d 100644 --- a/doc/kcontrol/smb/index.docbook +++ b/doc/kcontrol/smb/index.docbook @@ -14,8 +14,8 @@ -2009-11-20 - 4.4 +2013-12-05 + 4.12 KDE
[kio] doc/kcontrol/ebrowsing: add info about preferred shortcuts (Review:http://git.reviewboard.kde.org/r/104900/)
Git commit 0c8a7173f80933c629f9419786f45205c93cc247 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. add info about preferred shortcuts (Review:http://git.reviewboard.kde.org/r/104900/) M +8-2doc/kcontrol/ebrowsing/index.docbook http://commits.kde.org/kio/0c8a7173f80933c629f9419786f45205c93cc247 diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index cc5839d..b6ed818 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -14,8 +14,8 @@ -2009-11-23 - 4.4 +2012-06-02 + 4.9 KDE @@ -84,6 +84,12 @@ descending, and you can resize the columns. has to be checked to enable this feature. Use the buttons on the right to create, modify or delete shortcuts. +If Use preferred shortcuts only is checked, only +web shortcuts marked as preferred in the third column of the list +are used in places where only a few select +shortcuts can be shown at one time. + + Below the list you find two additional options: Default search engine
[kio] doc/kcontrol/ebrowsing: improve wording
Git commit 00b6fa8fc1c92a7d4cdf116007a9ebb0038cbe5c by Burkhard Lück.
Committed on 09/11/2016 at 07:04.
Pushed by lueck into branch 'master'.
improve wording
M +1-1doc/kcontrol/ebrowsing/index.docbook
http://commits.kde.org/kio/00b6fa8fc1c92a7d4cdf116007a9ebb0038cbe5c
diff --git a/doc/kcontrol/ebrowsing/index.docbook
b/doc/kcontrol/ebrowsing/index.docbook
index 67d0509..e7f02db 100644
--- a/doc/kcontrol/ebrowsing/index.docbook
+++ b/doc/kcontrol/ebrowsing/index.docbook
@@ -132,7 +132,7 @@ characters acts as a parameter, which is to say that they
are replaced
by whatever you happen to type after the colon character that is
between a shortcut and its parameter. To add this query placeholder
to a shortcuts url, click on the button at the right of the text box.
-Let's consider some examples to clarify this idea.
+Let's consider some examples to clarify how to use web shortcuts.
Suppose that the is
http://www.google.com/search?q=\{@}, and
[kio] doc/kcontrol: add missing titles for runtime kcm docs
Git commit d89c4cc52ccc9f2b1acfdd8170fd15bc55474190 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. add missing titles for runtime kcm docs svn path=/trunk/KDE/kdebase/runtime/; revision=1132866 M +1-1doc/kcontrol/cookies/index.docbook M +1-1doc/kcontrol/ebrowsing/index.docbook M +2-2doc/kcontrol/netpref/index.docbook M +2-2doc/kcontrol/smb/index.docbook http://commits.kde.org/kio/d89c4cc52ccc9f2b1acfdd8170fd15bc55474190 diff --git a/doc/kcontrol/cookies/index.docbook b/doc/kcontrol/cookies/index.docbook index d58358e..d16ede7 100644 --- a/doc/kcontrol/cookies/index.docbook +++ b/doc/kcontrol/cookies/index.docbook @@ -7,7 +7,7 @@ - +Cookies diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index 911f94d..cc5839d 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -7,7 +7,7 @@ - +Web Shortcuts diff --git a/doc/kcontrol/netpref/index.docbook b/doc/kcontrol/netpref/index.docbook index 056842a..b67ba84 100644 --- a/doc/kcontrol/netpref/index.docbook +++ b/doc/kcontrol/netpref/index.docbook @@ -7,7 +7,7 @@ - +Connection Preferences @@ -29,7 +29,7 @@ -Preferences +Connection Preferences Here you can set timeout values. You might want to tweak them if your connection is very slow, but the default settings are diff --git a/doc/kcontrol/smb/index.docbook b/doc/kcontrol/smb/index.docbook index 1a2b5e6..e60cc3d 100644 --- a/doc/kcontrol/smb/index.docbook +++ b/doc/kcontrol/smb/index.docbook @@ -7,7 +7,7 @@ - +Windows Shares @@ -105,4 +105,4 @@ checked, shares ending with a $ will be shown. - \ No newline at end of file +
[kio] doc/kcontrol/proxy: fix protocol name and abbreviation: http://tools.ietf.org/html/draft-ietf-wrec-wpad-01
Git commit ff1523ada606e8077aca305593c319d281411524 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. fix protocol name and abbreviation: http://tools.ietf.org/html/draft-ietf-wrec-wpad-01 M +2-2doc/kcontrol/proxy/index.docbook http://commits.kde.org/kio/ff1523ada606e8077aca305593c319d281411524 diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index a0a84d0..bf1f9ea 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -88,8 +88,8 @@ script file to be automatically detected and downloaded. This option only differs from the next choice in that it does not require you to supply the location of the configuration script file. Instead, it will be automatically -downloaded using Web Access Protocol Discovery -(WAPD). +downloaded using Web Proxy Auto-Discovery +(WPAD) protocol. If you have a problem using this setup, please consult the FAQ section at
[kio] doc/kcontrol/cookies: update to 4.10
Git commit 73cc9570ecffaec6b099c217b6147dfadc9db272 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. update to 4.10 M +27 -30 doc/kcontrol/cookies/index.docbook http://commits.kde.org/kio/73cc9570ecffaec6b099c217b6147dfadc9db272 diff --git a/doc/kcontrol/cookies/index.docbook b/doc/kcontrol/cookies/index.docbook index 408ddba..07f9147 100644 --- a/doc/kcontrol/cookies/index.docbook +++ b/doc/kcontrol/cookies/index.docbook @@ -14,8 +14,8 @@ -2009-11-24 - 4.4 +2011-11-11 + 4.10 KDE @@ -45,7 +45,7 @@ be quite useful to the web site owners, for example, by allowing them to collect summary statistics on the number of visits different areas of the web sites get, or to customize banner advertising. -The cookies module of the allows you to set policies +The cookies page allows you to set policies for the use of cookies when you are browsing the web with the web browser. @@ -110,30 +110,31 @@ choose to reject cookies from a particular site, session cookies from that site will be accepted. - - -Treat all cookies as session cookies - -If this option is enabled, all cookies are treated as session -cookies. That is, they are not kept when you leave the -web site. - -The definition of leave the web site is vague. -Some cookies may hang around for a little while after you are no -longer viewing any pages on a particular web site. This is -normal. - - - The section for Default Policy sets some further options that are mutually exclusive you can choose only one of these options as the default, but you are free to set a different option for any specific web server. +Site specific policies always take precedence over the default +policy. +Accept all cookies + +If this option is selected, all cookies will be accepted without +asking for confirmation. + + + +Accept until end of session + +Cookies will be accepted, but they will expire at the end +of the session. + + + Ask for confirmation If this option is selected, you will be asked for confirmation @@ -144,13 +145,6 @@ cookie for that domain. -Accept all cookies - -If this option is selected, all cookies will be accepted without -asking for confirmation. - - - Reject all cookies If this option is selected, all cookies will be rejected without @@ -161,17 +155,17 @@ asking for confirmation. In addition to the default policy for handling of cookies, which you can set by selecting one of the three options described above, you can also set -policies for specific host domains using the controls in the Domain -Specific group. +policies for specific host domains using the controls in the Site +Policy group. -The Ask, Accept, or Reject policy can be applied to a specific +The Ask, Accept, Accept until end of session, or Reject policy can be applied to a specific domain by clicking on the New... button, which brings up a dialog. In this dialog, you can type the name of the domain (with a leading dot), then select the policy you want to apply to this domain. Note that entries may also get added while you are browsing, if the default policy is to ask for confirmation, and you choose a general policy for a specific host (for example, by selecting -Reject all cookies from this domain when asked to +Reject when asked to confirm a cookie). You can also select a specific host domain from the list and click the @@ -191,7 +185,7 @@ apply to domains which have been deleted from the list. delete cookies that have been set in the past. In the upper part of this dialog, you can see a list of domains displayed -as a tree. Click on the little + next to a domain to see all + as a tree. Click on the little next to a domain to see all cookies that have been set for this particular target domain. If you select one of these cookies, you will notice that its contents will show up in the frame Details below. @@ -199,6 +193,9 @@ of these cookies, you will notice that its contents will show up in the frame By clicking the Delete button you can now delete the selected cookie. Click Delete All to delete all cookies stored. +If a domain is selected, you can use Configure Policy to set +a site policy. + Choose Reload List to reload the list from your hard disk. You might want to do this if you have had the module open and are testing web sites, or have made many changes in the
[kio] doc/kcontrol/ebrowsing: add description for new query placeholder button
Git commit d6515b3bcd8cafab8427b300e2d8c8b92fccda8b by Burkhard Lück.
Committed on 09/11/2016 at 07:04.
Pushed by lueck into branch 'master'.
add description for new query placeholder button
M +5-3doc/kcontrol/ebrowsing/index.docbook
http://commits.kde.org/kio/d6515b3bcd8cafab8427b300e2d8c8b92fccda8b
diff --git a/doc/kcontrol/ebrowsing/index.docbook
b/doc/kcontrol/ebrowsing/index.docbook
index cf40c88..67d0509 100644
--- a/doc/kcontrol/ebrowsing/index.docbook
+++ b/doc/kcontrol/ebrowsing/index.docbook
@@ -107,7 +107,8 @@ be searched.
If you double-click on a specific entry in the list of defined
-search providers, the details for that entry are shown in a popup
+search providers or click the Change button,
+the details for that entry are shown in a popup
dialog. In addition to the descriptive name for the item, you can
also see the which is used, as well as the
associated shortcuts which you can type anywhere in where
@@ -129,8 +130,9 @@ URL text box, you will find that most, if not
all of the
entries have a \{@} in them. This sequence of four
characters acts as a parameter, which is to say that they are replaced
by whatever you happen to type after the colon character that is
-between a shortcut and its parameter. Let's consider some examples to
-clarify this idea.
+between a shortcut and its parameter. To add this query placeholder
+to a shortcuts url, click on the button at the right of the text box.
+Let's consider some examples to clarify this idea.
Suppose that the is
http://www.google.com/search?q=\{@}, and
[kio] doc/kcontrol/ebrowsing: Fix link, get rid of KOffice entry (it is not installed by modern distributions)
Git commit 2289bfd2c6db9b89e2dabe70e0cf1636bd9314f0 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. Fix link, get rid of KOffice entry (it is not installed by modern distributions) M +3-3doc/kcontrol/ebrowsing/index.docbook http://commits.kde.org/kio/2289bfd2c6db9b89e2dabe70e0cf1636bd9314f0 diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index 0376cb0..cf40c88 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -150,9 +150,9 @@ left as is. You can also have shortcuts without parameters. Suppose the was -file:/home/me/mydocs/kofficefiles/kword and the -shortcut was mykword. Then, typing -mykword: is the same as typing the complete +file:/home/me/mydocs/calligra/words and the +shortcut was mywords. Then, typing +mywords: is the same as typing the complete . Note that there is nothing after the colon when typing the shortcut, but the colon is still required in order for the shortcut to be recognized as such.
Re: Review Request 129377: Remove trash kcm docbook from kio-extras
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129377/ --- (Updated Nov. 12, 2016, 2:25 p.m.) Status -- This change has been marked as submitted. Review request for Documentation, Plasma and Aleix Pol Gonzalez. Changes --- Submitted with commit f7a6bc8721c90e992e7535436929cd9580d46efc by Burkhard Lück to branch master. Repository: kio-extras Description --- the trash kcm docbook will be imported from kde-runtime master with history into frameworks/kio where the code is, see https://git.reviewboard.kde.org/r/128912/ this docbook was imported into kio-extras with https://cgit.kde.org/kio-extras.git/commit/doc/kcontrol/trash/index.docbook?id=09cd27cca7daa2339960efa0ab852ad492b5ac97 but why? Diffs - doc/CMakeLists.txt 0afa5b5 doc/kcontrol/CMakeLists.txt fe7c777 doc/kcontrol/trash/CMakeLists.txt 6790c61 doc/kcontrol/trash/index.docbook d550b1b Diff: https://git.reviewboard.kde.org/r/129377/diff/ Testing --- builds Thanks, Burkhard Lück
[kio] doc/kcontrol/cache: doc update kcm cache
Git commit 049c5bb104f4b65ef8c28afd824f84266a1acadc by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. doc update kcm cache svn path=/trunk/KDE/kdebase/runtime/; revision=1051950 M +6-9doc/kcontrol/cache/index.docbook http://commits.kde.org/kio/049c5bb104f4b65ef8c28afd824f84266a1acadc diff --git a/doc/kcontrol/cache/index.docbook b/doc/kcontrol/cache/index.docbook index 7392d63..e6cfaab 100644 --- a/doc/kcontrol/cache/index.docbook +++ b/doc/kcontrol/cache/index.docbook @@ -6,28 +6,26 @@ ]> +Cache - +LauriWatts -2003-10-12 -3.2 +2009-11-20 + 4.4 KDE -KControl +Systemsettings Konqueror Cache - -Cache - This module allows you to control the size of the local cache folder used by . Note that each user account on your computer has a separate cache folder, and this folder is not @@ -39,7 +37,7 @@ will only be necessary to reload the contents from the original site if they have changed since your last visit, or if you click the reload button in . -If you really don't want any of the web pages you visit to be +If you really do not want any of the web pages you visit to be stored on your computer, you can disable 's disk cache by clearing the checkbox labeled Use cache. @@ -64,6 +62,5 @@ the cache could become substantially larger. You can use the Clear Cache button to empty the cache at any time. -
[kio] doc/kcontrol: doc update kcms cookies/ebrowsing/useragent/
Git commit 616fb1f7ee566b0f27000b202146c7628bedc0c4 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. doc update kcms cookies/ebrowsing/useragent/ svn path=/trunk/KDE/kdebase/runtime/; revision=1053459 M +7-7doc/kcontrol/cookies/index.docbook M +43 -33 doc/kcontrol/ebrowsing/index.docbook M +9-16 doc/kcontrol/useragent/index.docbook http://commits.kde.org/kio/616fb1f7ee566b0f27000b202146c7628bedc0c4 diff --git a/doc/kcontrol/cookies/index.docbook b/doc/kcontrol/cookies/index.docbook index a1ea6fd..d58358e 100644 --- a/doc/kcontrol/cookies/index.docbook +++ b/doc/kcontrol/cookies/index.docbook @@ -14,12 +14,12 @@ -2003-10-12 -3.2 +2009-11-24 + 4.4 KDE -KControl +Systemsettings cookie @@ -45,7 +45,7 @@ be quite useful to the web site owners, for example, by allowing them to collect summary statistics on the number of visits different areas of the web sites get, or to customize banner advertising. -The cookies module of the allows you to set policies +The cookies module of the allows you to set policies for the use of cookies when you are browsing the web with the web browser. @@ -62,7 +62,7 @@ as . general cookie policy as well as special cookie policies for certain domains or hosts. -The top of the policy tab has a checkbox labeled Enable +The top of the policy tab has a check box labeled Enable cookies. If you leave this unchecked, cookies will be completely disabled. However, this may make browsing rather inconvenient, especially as some web sites require the use of browsers @@ -78,7 +78,7 @@ specific policies on how you want them to be handled. Only accept cookies from originating server Some pages try to set cookies from servers other than the one -you are seeing the HTML page from. For example, +you are seeing the page from. For example, they show you advertisements, and the advertisements are from another computer, often one that belongs to a large advertising group. These advertisements may try to set a cookie which would allow them to @@ -194,7 +194,7 @@ delete cookies that have been set in the past. as a tree. Click on the little + next to a domain to see all cookies that have been set for this particular target domain. If you select one of these cookies, you will notice that its contents will show up in the frame -Cookie Details below. +Details below. By clicking the Delete button you can now delete the selected cookie. Click Delete All to delete all cookies stored. diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index 6df65ae..064451d 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -14,12 +14,12 @@ -2002-10-16 -3.1 +2009-11-23 + 4.4 KDE -KControl +Systemsettings enhanced browsing web shortcuts browsing @@ -41,31 +41,31 @@ experience. One such feature is Web Shortcuts. For example, you can click on the Run menu item or type the keyboard shortcut assigned to that command (F2, -unless you have changed it) and type in a URI. +unless you have changed it) and type in a . Uniform Resource Identifier. A standardized way of referring to a resource such as a file on your computer, a World Wide Web address, an email address, etc Web shortcuts, on the other hand, let you come up with new pseudo -URL schemes, or shortcuts, that basically let you + schemes, or shortcuts, that basically let you parameterize commonly used -URIs. For example, if you like the Google search -engine, you can configure KDE so that a pseudo URL +s. For example, if you like the Google search +engine, you can configure so that a pseudo scheme like gg will trigger a search on Google. This way, typing gg:my query will search for my query on Google. -One can see why we call these pseudo URL -schemes. They are used like a URL scheme, but the -input is not properly URL encoded, so one will type +One can see why we call these pseudo +schemes. They are used like a scheme, but the +input is not properly encoded, so one will type google:kde apps and not google:kde+apps. You can use web shortcuts wherever you would normally use -URIs. Shortcuts for several search engines should +s. Shortcuts for several search engines should already be configured on your system, but you can add new keywords, and change or delete existing ones in the enhanced browsing control module. @@ -74,27 +74,39 @@ module. -Use - -There is a single tab in this control module. The title of the tab -is Keywords. This tab features two main boxes, one -for Internet Keywords and one for web shortcuts. - - - Web Shortcuts The descriptive names of defined web shortcuts are shown in a -listbox. As with other lists in , you can click on a column +list box. As with other lists in , you can click on a column heading to toggle the sort order between ascending and descending, and you can resize the columns
[kio] doc/kcontrol/proxy: typo fix
Git commit ac3d617156cd2cf859e34552369a932a8cc97557 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. typo fix svn path=/trunk/KDE/kdebase/runtime/; revision=1051779 M +3-3doc/kcontrol/proxy/index.docbook http://commits.kde.org/kio/ac3d617156cd2cf859e34552369a932a8cc97557 diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index 62cbcbf..a0a84d0 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -80,7 +80,7 @@ configure the settings for it. -Automatically detected proxy configuration +Automatically detect proxy configuration Select this option if you want the proxy setup configuration @@ -109,7 +109,7 @@ icon to browse to it. -Use preset environment variables +Use preset proxy environment variables Some systems are setup with $HTTP_PROXY to allow graphical as well as non-graphical applications to share the same @@ -121,7 +121,7 @@ variable names used to set the address of the proxy server(s). -Manually speciffy the proxy settings +Manually specify the proxy settings Select this option, and click on the Setup... to manually setup the location of the
[kio] doc/kcontrol/ebrowsing: using entities makes translators life easier, kcmshell->kcmshell4
Git commit 5a10c0c024c0b2fa7f1506b18b3cfd3609779632 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. using entities makes translators life easier, kcmshell->kcmshell4 svn path=/trunk/KDE/kdebase/runtime/; revision=847977 M +1-1doc/kcontrol/ebrowsing/index.docbook http://commits.kde.org/kio/5a10c0c024c0b2fa7f1506b18b3cfd3609779632 diff --git a/doc/kcontrol/ebrowsing/index.docbook b/doc/kcontrol/ebrowsing/index.docbook index da9167f..6df65ae 100644 --- a/doc/kcontrol/ebrowsing/index.docbook +++ b/doc/kcontrol/ebrowsing/index.docbook @@ -40,7 +40,7 @@ experience. One such feature is Web Shortcuts. You may already have noticed that is very Internet friendly. For example, you can click on the Run menu item or type the keyboard shortcut assigned to that command (AltF2, +action="simul">F2, unless you have changed it) and type in a URI. Uniform Resource Identifier. A standardized way of referring to a resource such as a file on your computer, a World Wide
[kio] doc/kcontrol/netpref: update date + releaseinfo
Git commit 6845a5e5a93a9f48138c9c39734122944cea31fe by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. update date + releaseinfo svn path=/trunk/KDE/kdebase/runtime/; revision=1051454 M +3-3doc/kcontrol/netpref/index.docbook http://commits.kde.org/kio/6845a5e5a93a9f48138c9c39734122944cea31fe diff --git a/doc/kcontrol/netpref/index.docbook b/doc/kcontrol/netpref/index.docbook index f97b30b..056842a 100644 --- a/doc/kcontrol/netpref/index.docbook +++ b/doc/kcontrol/netpref/index.docbook @@ -14,8 +14,8 @@ -2002-10-16 -3.1 +2009-11-19 + 4.4 KDE @@ -106,4 +106,4 @@ of the file. This extension is removed once the file download is complete. - \ No newline at end of file +
[kio] doc/kcontrol/trash: add trash docs
Git commit c4a64a5a06891a08986ff41c1991a3ab960a4e70 by Burkhard Lück.
Committed on 09/11/2016 at 07:04.
Pushed by lueck into branch 'master'.
add trash docs
svn path=/trunk/KDE/kdebase/runtime/; revision=1053697
A +2-0doc/kcontrol/trash/CMakeLists.txt
A +65 -0doc/kcontrol/trash/index.docbook
http://commits.kde.org/kio/c4a64a5a06891a08986ff41c1991a3ab960a4e70
diff --git a/doc/kcontrol/trash/CMakeLists.txt
b/doc/kcontrol/trash/CMakeLists.txt
new file mode 100644
index 000..559f8e3
--- /dev/null
+++ b/doc/kcontrol/trash/CMakeLists.txt
@@ -0,0 +1,2 @@
+### install files ###
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
SUBDIR kcontrol/trash)
diff --git a/doc/kcontrol/trash/index.docbook b/doc/kcontrol/trash/index.docbook
new file mode 100644
index 000..0b4f199
--- /dev/null
+++ b/doc/kcontrol/trash/index.docbook
@@ -0,0 +1,65 @@
+
+
+
+]>
+
+Trash
+
+
+
+
+
+
+2009-11-24
+ 4.4
+
+
+KDE
+Systemsettings
+trash
+
+
+
+
+This module allows you to configure the settings for the trash.
+
+
+
+Delete files older than
+
+Check this box to allow automatic deletion of files that are
+older than the value specified. Leave this disabled to
not
+automatically delete any items after a certain timespan.
+Set the number of days that files can remain in the trash. Any files
+older than this will be automatically deleted.
+
+
+
+Limit to maximum size
+
+Check this box to limit the trash to the maximum amount of disk space
+that you specify below. Otherwise, it will be unlimited.
+
+
+
+Maximum size
+
+This is the maximum percent of disk space that will be used for the
+trash. The calculated amount of disk space that will be allowed for
+the trash is displayed right of the spinbox.
+
+
+
+When limit reached
+
+When the size limit is reached, the selected action will be performed,
+either the oldest or biggest files will be deleted automatically
+or you will be warned.
+
+
+
+
+
+
Re: Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128912/ --- (Updated Nov. 12, 2016, 2:13 p.m.) Status -- This change has been marked as submitted. Review request for Documentation, KDE Frameworks and Plasma. Changes --- Submitted with commit e0c3945a88fd041f36ff3873f6fe0ca5cfa00158 by Burkhard Lück to branch master. Repository: kio Description --- doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ doc/kcontrol/ebrowsing/ doc/kcontrol/smb/ splitted from kde-runtime master using https://github.com/ajdruff/git-splits Not included in build so far, the docbooks are imported as they were splitted To be done next: Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5, rename ebrowsing to webshortcuts reapply a few updates done in plasma-desktop remove these imported kcontrol docbooks from plasma-desktop adapt scripty to these changes Diffs - docs/CMakeLists.txt 350bce3 docs/kcontrol5/CMakeLists.txt PRE-CREATION docs/kcontrol5/cache/CMakeLists.txt PRE-CREATION docs/kcontrol5/cache/index.docbook PRE-CREATION docs/kcontrol5/cookies/CMakeLists.txt PRE-CREATION docs/kcontrol5/cookies/index.docbook PRE-CREATION docs/kcontrol5/netpref/CMakeLists.txt PRE-CREATION docs/kcontrol5/netpref/index.docbook PRE-CREATION docs/kcontrol5/proxy/CMakeLists.txt PRE-CREATION docs/kcontrol5/proxy/index.docbook PRE-CREATION docs/kcontrol5/smb/CMakeLists.txt PRE-CREATION docs/kcontrol5/smb/index.docbook PRE-CREATION docs/kcontrol5/trash/CMakeLists.txt PRE-CREATION docs/kcontrol5/trash/index.docbook PRE-CREATION docs/kcontrol5/useragent/CMakeLists.txt PRE-CREATION docs/kcontrol5/useragent/index.docbook PRE-CREATION docs/kcontrol5/webshortcuts/CMakeLists.txt PRE-CREATION docs/kcontrol5/webshortcuts/index.docbook PRE-CREATION src/ioslaves/trash/kcmtrash.desktop c8ff4ac src/kcms/kio/cache.desktop f0bd261 src/kcms/kio/cookies.desktop f91b5cd src/kcms/kio/netpref.desktop 963ef3f src/kcms/kio/proxy.desktop c11451d src/kcms/kio/smb.desktop c323614 src/kcms/kio/useragent.desktop 856e9cc src/kcms/webshortcuts/webshortcuts.desktop 24fbb2a Diff: https://git.reviewboard.kde.org/r/128912/diff/ Testing --- history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime master File Attachments git-log-doc-kcontrol.output https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output kio-log-docs.txt https://git.reviewboard.kde.org/media/uploaded/files/2016/11/11/911e5e67-3094-4d47-aa94-95129f5545fe__kio-log-docs.txt Thanks, Burkhard Lück
[kio] doc/kcontrol/proxy: doc update pcm proxy
Git commit fe9238a75bade6d20b59c583cf9d0efb3e8846ad by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. doc update pcm proxy svn path=/trunk/KDE/kdebase/runtime/; revision=1051433 M +11 -23 doc/kcontrol/proxy/index.docbook http://commits.kde.org/kio/fe9238a75bade6d20b59c583cf9d0efb3e8846ad diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook index 0a47cec..62cbcbf 100644 --- a/doc/kcontrol/proxy/index.docbook +++ b/doc/kcontrol/proxy/index.docbook @@ -1,26 +1,24 @@ ]> +Proxy - - -2002-02-11 -3.00.00 +2009-11-18 + 4.4 KDE -KControl +Systemsettings proxy proxies @@ -82,7 +80,7 @@ configure the settings for it. -Automatically detected script file +Automatically detected proxy configuration Select this option if you want the proxy setup configuration @@ -101,7 +99,7 @@ more information. -Specified script file +Use proxy configuration URL Select this option if your proxy support is provided through a script file located at a specific address. You can then enter the @@ -111,7 +109,7 @@ icon to browse to it. -Preset environment variables +Use preset environment variables Some systems are setup with $HTTP_PROXY to allow graphical as well as non-graphical applications to share the same @@ -123,7 +121,7 @@ variable names used to set the address of the proxy server(s). -Manually specified settings +Manually speciffy the proxy settings Select this option, and click on the Setup... to manually setup the location of the @@ -138,12 +136,6 @@ the information from the HTTP line to the FTP line, in order to help save some typing. -If there are hosts which you can connect to without going -through the proxy server, you can press Add to -add the names of these hosts, separated by in the text box labeled -No Proxy For:. For example, hosts that are on -your local network can probably be contacted directly. - You can also choose Only use proxy for entries in this list. @@ -169,11 +161,9 @@ proxy requires it. You can have Prompt as needed, the default, in which case will only ask for a username or password if it needs to. -The other option is Use automatic login. -Select this option if you have already set up a login entry for your -proxy server in the -$KDEDIR/share/config/kionetrc -file. +The other option is to use automatic login. +Select this option and enter Username and Password. + @@ -190,8 +180,6 @@ file. - -
[kio] doc/kcontrol/proxy: remove obsolete doc
Git commit c908e80f2a53061da6869a3acb9c0142bc6a86e0 by Burkhard Lück. Committed on 09/11/2016 at 07:04. Pushed by lueck into branch 'master'. remove obsolete doc svn path=/trunk/KDE/kdebase/runtime/; revision=1053789 D +0-56 doc/kcontrol/proxy/socks.docbook http://commits.kde.org/kio/c908e80f2a53061da6869a3acb9c0142bc6a86e0 diff --git a/doc/kcontrol/proxy/socks.docbook b/doc/kcontrol/proxy/socks.docbook deleted file mode 100644 index 73c5e2e..000 --- a/doc/kcontrol/proxy/socks.docbook +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - -SOCKS - -SOCKS is a protocol to execute proxy requests for a client. SOCKS -is capable of authentication and encryption of traffic, and is often -found in corporate settings, as opposed to home users. For more -information about SOCKS, see the http://www.socks.nec.com;>NEC website - -With this module you can enable most of the network aware -applications to transparently use SOCKS. - -Setting up of a SOCKS client is outside the scope of this -document, and the differences between the commonly used ones are very -large. If you already have a working SOCKS implementation, allowing you -to use commandline clients (for example, if lynx or -ftp are already working) then you can simply check -the Enable SOCKS support checkbox. - -When this box is checked, several further options become available -to you. - -First, you should select which of the various SOCKS clients you -have installed on your computer. will attempt to find this out by -itself, if you choose Auto detect. If you know the -client you have, you could choose either NEC -Socks or Dante. If you have a -custom built SOCKS library to use, you can select Use custom -library and then enter the path to it in the -Path field. - -If you want to auto detect the SOCKS library in use, but you -suspect it isn't looking in the right places or you have installed it in -a non-standard location, then you can add further paths to be searched in -the bottom of this panel. Use the Add and -Remove to add or remove paths. - -At any time while filling in this module, you can press the -Test button, and will report immediately -with a message box to tell you if it could find and initialize SOCKS or -not. - -Changes made here will not affect any applications that are -already open. You will need to close and restart them before they are -able to connect via SOCKS. - - - -
[kio] doc/kcontrol: Move doc for runtime here
Git commit 8ef9766d4799ebd9997199f805e09b6477906d47 by Burkhard Lück, on behalf
of Laurent Montel.
Committed on 09/11/2016 at 07:04.
Pushed by lueck into branch 'master'.
Move doc for runtime here
svn path=/trunk/KDE/kdebase/runtime/; revision=706565
A +2-0doc/kcontrol/cache/CMakeLists.txt
A +69 -0doc/kcontrol/cache/index.docbook
A +2-0doc/kcontrol/cookies/CMakeLists.txt
A +211 -0doc/kcontrol/cookies/index.docbook
A +2-0doc/kcontrol/ebrowsing/CMakeLists.txt
A +156 -0doc/kcontrol/ebrowsing/index.docbook
A +2-0doc/kcontrol/netpref/CMakeLists.txt
A +109 -0doc/kcontrol/netpref/index.docbook
A +2-0doc/kcontrol/proxy/CMakeLists.txt
A +197 -0doc/kcontrol/proxy/index.docbook
A +56 -0doc/kcontrol/proxy/socks.docbook
A +2-0doc/kcontrol/smb/CMakeLists.txt
A +106 -0doc/kcontrol/smb/index.docbook
A +2-0doc/kcontrol/useragent/CMakeLists.txt
A +117 -0doc/kcontrol/useragent/index.docbook
http://commits.kde.org/kio/8ef9766d4799ebd9997199f805e09b6477906d47
diff --git a/doc/kcontrol/cache/CMakeLists.txt
b/doc/kcontrol/cache/CMakeLists.txt
new file mode 100644
index 000..7509aba
--- /dev/null
+++ b/doc/kcontrol/cache/CMakeLists.txt
@@ -0,0 +1,2 @@
+### install files ###
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
SUBDIR kcontrol/cache)
diff --git a/doc/kcontrol/cache/index.docbook b/doc/kcontrol/cache/index.docbook
new file mode 100644
index 000..7392d63
--- /dev/null
+++ b/doc/kcontrol/cache/index.docbook
@@ -0,0 +1,69 @@
+
+
+
+]>
+
+
+
+
+
+
+
+
+
+
+2003-10-12
+3.2
+
+
+KDE
+KControl
+Konqueror
+Cache
+
+
+
+
+Cache
+
+This module allows you to control the size of the local cache
+folder used by . 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 .
+
+Storing local copies of web pages that you have visited allows
+ to quickly load their contents on subsequent visits. It
+will only be necessary to reload the contents from the original site
+if they have changed since your last visit, or if you click the reload
+button in .
+
+If you really don't want any of the web pages you visit to be
+stored on your computer, you can disable 's disk cache by
+clearing the checkbox labeled Use cache.
+
+You can set here how aggressively keeps the cache up
+to date. Keep cache in sync means that
+will hit the cache for all objects, downloading them if they are not
+there, and then display the item from the cache. Use cache
+whenever possible means that will try the cache,
+and if an object is not there, it will directly download it for display.
+Offline browsing mode means that will
+try the cache, and if an object is not there, it will not attempt to
+download it from the Internet.
+
+You can control the size of the cache by typing a number into the
+text box labeled Disk cache size. This is the
+average amount of space in kilobytes that the cache folder is allowed
+to use. When the cache grows too large, will delete older
+files to reduce the size of the cache folder.
+
+This is however, only an average, and during a browsing session
+the cache could become substantially larger.
+
+You can use the Clear Cache button to empty
+the cache at any time.
+
+
+
diff --git a/doc/kcontrol/cookies/CMakeLists.txt
b/doc/kcontrol/cookies/CMakeLists.txt
new file mode 100644
index 000..88fac29
--- /dev/null
+++ b/doc/kcontrol/cookies/CMakeLists.txt
@@ -0,0 +1,2 @@
+### install files ###
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
SUBDIR kcontrol/cookies)
diff --git a/doc/kcontrol/cookies/index.docbook
b/doc/kcontrol/cookies/index.docbook
new file mode 100644
index 000..a1ea6fd
--- /dev/null
+++ b/doc/kcontrol/cookies/index.docbook
@@ -0,0 +1,211 @@
+
+
+
+]>
+
+
+
+
+
+
+
+
+
+
+2003-10-12
+3.2
+
+
+KDE
+KControl
+cookie
+
+
+
+
+
+Cookies
+
+Cookies are a mechanism used by web sites to store and retrieve
+information using your browser. For example, a web site may allow you
+to customize the content and layout of the pages you see, so that your
+choices are persistent across different visits to that web site.
+
+The web site is able to remember your preferences by storing a
+cookie on your computer. Then, on future visits, the web site retrieves
+the information stored in the cookie to format the content of the site
+according to your previously specified preferences.
+
+Thus, cookies play a very useful role in web browsing.
+Unfortunately, web sites often store and retrieve information in cookies
+without your explicit knowledge or consent. Some of this information may
+be quite useful to the web site owners, for example, by allowing them to
+collect summary statistics on the number of visits different areas of
+the web sites get, or to customize banner advertising.
+
+The cookies module of the
[kde-cli-tools] doc/kcontrol/filetypes: update kcm + systemsetting docs to the new categories! A .0 release with up to date kcm + systemsetting docs!
Git commit 95ca0a5b4e461d08438f7a23efe8dd470b54fabc by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. update kcm + systemsetting docs to the new categories! A .0 release with up to date kcm + systemsetting docs! CCMAIL:kde-i18n-...@kde.org svn path=/trunk/KDE/kdebase/runtime/; revision=1141927 M +3-3doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/95ca0a5b4e461d08438f7a23efe8dd470b54fabc diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index d4cd544..d2d7dc1 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -14,8 +14,8 @@ -2009-11-22 -4.4 +2010-06-23 + 4.5 KDE @@ -68,7 +68,7 @@ without opening and analyzing the format of each and every file. You can start this module by opening and selecting File Associations in the -Application Appearance and Behavior category. Alternatively, you can start it by +Common Appearance and Behavior category. Alternatively, you can start it by typing kcmshell4 filetypes from the terminal or . The file associations are organized into several categories, and
[kde-cli-tools] doc/kcontrol/filetypes: proofreading/updating/bump version of runtime kcm docs in Common Appearance and Behavior category
Git commit 83aa87dc463b80be53cce4e4d0f8c9e9a2dbd05e by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. proofreading/updating/bump version of runtime kcm docs in Common Appearance and Behavior category M +8-7doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/83aa87dc463b80be53cce4e4d0f8c9e9a2dbd05e diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index a344eee..36a3129 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -1,6 +1,7 @@ Calligra Words"> ]> @@ -14,8 +15,8 @@ -2011-11-28 - 4.8 +2013-12-05 + 4.12 KDE @@ -32,12 +33,12 @@ One of the most convenient aspects of , is its ability to automatically match a data file with its application. As an example, -when you click on your favorite document in the filemanager, -automatically starts , and automatically loads that file into - so you can begin working on it. +when you click on your favorite document in the filemanager, +automatically starts , and automatically loads that file into + so you can begin working on it. -In the example above, the Data file is -associated with (the application). These +In the example above, the Data file is +associated with (the application). These file associations are crucial to the functioning of . When is installed, it automatically creates hundreds of file
[kde-cli-tools] doc/kcontrol/filetypes: proofreading + rm Print category
Git commit c622136407fce297d69b02e19ce0d3817bfeb1bb by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. proofreading + rm Print category M +2-3doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/c622136407fce297d69b02e19ce0d3817bfeb1bb diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index d2d7dc1..b5327b4 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -14,8 +14,8 @@ -2010-06-23 - 4.5 +2011-11-28 + 4.8 KDE @@ -81,7 +81,6 @@ at a minimum you will have: Inode Message Multipart -Print Text Video
[kde-cli-tools] doc/kcontrol/filetypes: Remove extra dots after entity
Git commit 314d0d2cc00db1caedb86fb5ed66d9c837f6898c by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. Remove extra dots after entity M +1-1doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/314d0d2cc00db1caedb86fb5ed66d9c837f6898c diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index a8c6ce7..a344eee 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -244,7 +244,7 @@ applications) which are used to configure the applications. The list box lists all of the applications associated with a specific type. The list is in a specific order. The top application is the first application tried. The next application down -the list is the second, . +the list is the second, What do you mean there is more than one application per type? Why is this necessary?
[kde-cli-tools] doc/kcontrol/filetypes: docs: add missing ids, avoid duplicates
Git commit c8e842a04fdefd4c9444a6563693dd0095dda9ca by Burkhard Lück, on behalf of Luigi Toscano. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. docs: add missing ids, avoid duplicates This commits combines the effect of the following commits from KDE/4.9: 26195cffd560f046a5ea0b98a7edecb56f38ca9a 17fc976ca4eb29f56b8c61667d714b287cec97a2 (*) 730cd2f83c7847f030464ae003e3eded8fb1cb02 bcb962e2460376623d710c8be3d116dc11a2ed45 (*) 09388c4e5cb97fb33604c4c273aa359863082ba5 where (*) marks partial or total reverts; cherry-picking each single commit would have introduced more noise in this branch M +1-1doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/c8e842a04fdefd4c9444a6563693dd0095dda9ca diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index b5327b4..a8c6ce7 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -5,7 +5,7 @@ ]> - + File Associations
[kde-cli-tools] /: Update imported filetypes kcm docbook
Git commit 775cc72ed9a529de02607e277b379ed6260399ef by Burkhard Lück.
Committed on 11/11/2016 at 08:56.
Pushed by lueck into branch 'master'.
Update imported filetypes kcm docbook
adapt CMakeLists.txt, change dtd to kf5
reapply one update done in plasma-desktop
proofread, bump date + releaseinfo
make co-installable using subdir kcontrol5
REVIEW:128914
M +1-0doc/CMakeLists.txt
D +0-2doc/kcontrol/filetypes/CMakeLists.txt
A +1-0doc/kcontrol5/CMakeLists.txt
A +2-0doc/kcontrol5/filetypes/CMakeLists.txt
R +17 -17 doc/kcontrol5/filetypes/index.docbook [from:
doc/kcontrol/filetypes/index.docbook - 094% similarity]
M +1-1keditfiletype/filetypes.desktop
http://commits.kde.org/kde-cli-tools/775cc72ed9a529de02607e277b379ed6260399ef
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 6987c14..38e2759 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,3 +1,4 @@
+ecm_optional_add_subdirectory(kcontrol5)
if(UNIX)
ecm_optional_add_subdirectory(kdesu)
endif()
diff --git a/doc/kcontrol/filetypes/CMakeLists.txt
b/doc/kcontrol/filetypes/CMakeLists.txt
deleted file mode 100644
index e12793e..000
--- a/doc/kcontrol/filetypes/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-### install files ###
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
SUBDIR kcontrol/filetypes)
diff --git a/doc/kcontrol5/CMakeLists.txt b/doc/kcontrol5/CMakeLists.txt
new file mode 100644
index 000..edf3e05
--- /dev/null
+++ b/doc/kcontrol5/CMakeLists.txt
@@ -0,0 +1 @@
+ecm_optional_add_subdirectory(filetypes)
diff --git a/doc/kcontrol5/filetypes/CMakeLists.txt
b/doc/kcontrol5/filetypes/CMakeLists.txt
new file mode 100644
index 000..72d5fea
--- /dev/null
+++ b/doc/kcontrol5/filetypes/CMakeLists.txt
@@ -0,0 +1,2 @@
+### install files ###
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION
${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/filetypes)
diff --git a/doc/kcontrol/filetypes/index.docbook
b/doc/kcontrol5/filetypes/index.docbook
similarity index 94%
rename from doc/kcontrol/filetypes/index.docbook
rename to doc/kcontrol5/filetypes/index.docbook
index 36a3129..6201c26 100644
--- a/doc/kcontrol/filetypes/index.docbook
+++ b/doc/kcontrol5/filetypes/index.docbook
@@ -1,7 +1,6 @@
-Calligra Words">
+
]>
@@ -15,8 +14,8 @@
-2013-12-05
- 4.12
+2016-11-11
+Plasma 5.8
KDE
@@ -67,10 +66,11 @@ without opening and analyzing the format of each and every
file.
How to use this module
-You can start this module
-by opening and selecting File
Associations in the
-Common Appearance and Behavior category. Alternatively,
you can start it by
-typing kcmshell4 filetypes from the terminal or
.
+You can start this module
+by opening and selecting
Applications
+File Associations in the
+Personalization category. Alternatively, you can start it
by
+typing kcmshell5 filetypes from the terminal or
.
The file associations are organized into several categories, and
at a minimum you will have:
@@ -135,6 +135,7 @@ type you want to delete by clicking once with the mouse on
the
type name. Then click the button labeled
Remove. The type will be deleted
immediately.
+You can remove only your own types.
@@ -262,7 +263,7 @@ system.
applications associated with this file type. The first program is
called . If your system does not
have installed, then
-automatically starts the second application .
+automatically starts the second application .
As you can see, this will help keep running
strong as you add and subtract applications.
@@ -279,15 +280,14 @@ dialog box, you can select the application you want to
use for this mime
type. Click OK when you are done, and the
application will be added to the current list.
-To change the options of an application for a particular type
-select it in the list and then press the Edit...
button.
-This opens a new dialog with General,
-Permissions, Applications and
-Preview tabs.
+To change the options of an application for a particular type
+select it in the list and then press the Edit... button.
+This opens a new dialog with General,
+Permissions and Applications.
On the Applications tab you can edit
Name,
Description and Comment.
-In the Command field you can have several place holders
-following the command, which will be replaced with the actual values
+In the Command field you can have several place holders
+following the command, which will be replaced with the actual values
when the actual program is run:
%f - a single file name
diff --git a/keditfiletype/filetypes.desktop b/keditfiletype/filetypes.desktop
index 76f11cf..e29c876 100644
--- a/keditfiletype/filetypes.desktop
+++ b/keditfiletype/filetypes.desktop
@@ -3,7 +3,7 @@ Icon=preferences-desktop-filetype-association
Type=Service
X-KDE-ServiceTypes=KCModule
Exec=kcmshell5 filetypes
-X-DocPath=kcontrol/filetypes/index.html
+X-DocPat
[kde-cli-tools] doc/kcontrol/filetypes: add period
Git commit bc4516ffd27eac1e57dd4c3a605e544fa5876379 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. add period svn path=/trunk/KDE/kdebase/runtime/; revision=1086122 M +1-1doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/bc4516ffd27eac1e57dd4c3a605e544fa5876379 diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index 4273164..278be87 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -280,7 +280,7 @@ type. Click OK when you are done, and the application will be added to the current list. To change the options of an application for a particular type -select it in the list and then press the Edit.. button. +select it in the list and then press the Edit... button. This opens a new dialog with General, Permissions, Applications and Preview tabs.
[kde-cli-tools] doc/kcontrol/filetypes: Move doc for runtime here
Git commit 89f19ad4665defa901e051a4bebc797caab9616e by Burkhard Lück, on behalf
of Laurent Montel.
Committed on 10/11/2016 at 16:24.
Pushed by lueck into branch 'master'.
Move doc for runtime here
svn path=/trunk/KDE/kdebase/runtime/; revision=706565
A +2-0doc/kcontrol/filetypes/CMakeLists.txt
A +338 -0doc/kcontrol/filetypes/index.docbook
http://commits.kde.org/kde-cli-tools/89f19ad4665defa901e051a4bebc797caab9616e
diff --git a/doc/kcontrol/filetypes/CMakeLists.txt
b/doc/kcontrol/filetypes/CMakeLists.txt
new file mode 100644
index 000..e12793e
--- /dev/null
+++ b/doc/kcontrol/filetypes/CMakeLists.txt
@@ -0,0 +1,2 @@
+### install files ###
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
SUBDIR kcontrol/filetypes)
diff --git a/doc/kcontrol/filetypes/index.docbook
b/doc/kcontrol/filetypes/index.docbook
new file mode 100644
index 000..a838156
--- /dev/null
+++ b/doc/kcontrol/filetypes/index.docbook
@@ -0,0 +1,338 @@
+
+
+
+]>
+
+
+
+
+File Associations
+
+
+
+
+
+2003-10-13
+3.2
+
+
+KDE
+KControl
+files association
+association
+
+
+
+File Associations
+
+
+Introduction
+
+One of the most convenient aspects of , is its ability to
+automatically match a data file, with its application. As an example,
+when you click on your favorite document in ,
+automatically starts , and automatically loads that file into
+ so you can begin working on it.
+
+In the example above, the Data file is
+associated with (the application). These
+file associations are crucial to the functioning of .
+
+When is installed, it automatically creates hundreds of file
+associations to many of the most common data types. These initial
+associations are based on the most commonly included software, and the
+most common user preferences.
+
+Unfortunately, can not:
+
+
+predict every possible combination of software and data
files
+prepare for file formats not yet invented
+or predict everyone's favorite application for certain file
formats
+
+
+You can change your current file associations or add new file
+associations using this module.
+
+Each file association is recorded as a mime type.
+ stands for Multipurpose Internet Mail
+Extensions. It allows a computer to determine the type of file,
+without opening and analyzing the format of each and every file.
+
+
+
+
+How to use this module
+
+The file associations are organized into several categories, and
+at a minimum you will have:
+
+
+Application
+Audio
+Image
+Inode
+Message
+Multipart
+Print
+Text
+Video
+
+
+All of the file associations are sorted into one of these
+categories.
+
+There is also an overview category All, which
+displays all the file types in one list, without categorizing
+them.
+
+There is no functional difference between any of the
+categories. These categories are designed to help organize your file
+associations, but they do not alter the associations in any way.
+
+
+The categories are listed in the box labeled Known
+Types.
+
+You can explore each of these categories, and see the file
+associations contained within each one, by simply double-clicking on the
+category name. You will be presented with a list of the associated
+mime-types under that category.
+
+You can also search for a particular type by using the
+search box. The search box is labeled Find filename
+pattern and is located above the category list.
+
+Simply type the first letter of the type you are interested
+in. The categories are automatically expanded, and only the mime-types
+that include that letter are displayed.
+
+You can then enter a second character and the mime-types will be
+further limited to mime types containing those two
+characters.
+
+
+Adding a new mime type
+
+If you want to add a new type to your file associations,
+you can click on the Add... button. A small
+dialog box will appear. You select the category from the drop down
+box, and type the name in the blank labeled Type
+name. Click OK to add the new mime
+type, or click Cancel to not add any new
+mime-types.
+
+
+
+
+Removing a mime type
+
+If you want to remove a type, simply select the
+type you want to delete by clicking once with the mouse on the
+type name. Then click the button labeled
+Remove. The type will be deleted
+immediately.
+
+
+
+
+Editing a mime types properties
+
+Before you can edit a types property, you must first
+specify which type. Simply browse through the categories until
+you find the type you want to edit, then click once on it with
+the mouse.
+
+As soon as you have selected the type, the current values of
+the type will appear in the module window.
+
+You will notice the current values are split into two tabs:
+General and Embedding
+
+
+
+General
+
+There are 4 properties for each type in this tab:
+
+
+Mime Type Icon is the icon that
+will be visible when using as a file
+manager.
+Filename Patterns is a search
+pattern which will use to determine the t
[kde-cli-tools] doc/kcontrol/filetypes: explain diff between konqui and dolphin wrt embedded views
Git commit 717eb4f05c2544d9663a2eb7083963c78242f458 by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. explain diff between konqui and dolphin wrt embedded views svn path=/trunk/KDE/kdebase/runtime/; revision=1052607 M +11 -8doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/717eb4f05c2544d9663a2eb7083963c78242f458 diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index e06f6b8..6fcc804 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -14,8 +14,8 @@ -2009-08-06 -4.3 +2009-11-22 +4.4 KDE @@ -239,10 +239,10 @@ you, it does not affect the function of the type. There are five buttons (Move Up, Move Down, Add, Edit and -Remove) and a combo box (which lists the +Remove) and a list box (which lists the applications) which are used to configure the applications. -The combo box lists all of the applications associated with a +The list box lists all of the applications associated with a specific type. The list is in a specific order. The top application is the first application tried. The next application down the list is the second, . @@ -295,8 +295,10 @@ there will not be an application to view the data document. Embedding +These settings are valid only for used as file manager, +is not able to use embedded views and opens a file always in the associated application. By clicking on the Embedding tab, you are -presented with three radio buttons in the Left click +presented with four radio buttons in the Left click action group. These determine how the filemanager views the selected type: @@ -308,8 +310,9 @@ action group. These determine how the filemanager views the selected Use settings for 'application' group This will cause the mime-type to use the settings for the mime-type group. (if you are editing an audio mime type, then the settings for the audio group are used). - +Ask whether to save to disk instead +This settings applies only to in browser mode and determines +if the file is shown in an embedded viewer or if you are asked to save the file to disl instead. Below this is a listbox labeled Services Preference @@ -338,4 +341,4 @@ you in this module. - \ No newline at end of file +
[kde-cli-tools] doc/kcontrol/filetypes: adapt base runtime docs to new systemsettings categories
Git commit a8b42049a821398ddb156c72c44e9fefed62d597 by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. adapt base runtime docs to new systemsettings categories svn path=/trunk/KDE/kdebase/runtime/; revision=1132739 M +2-2doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/a8b42049a821398ddb156c72c44e9fefed62d597 diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index 278be87..d4cd544 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -67,8 +67,8 @@ without opening and analyzing the format of each and every file. How to use this module You can start this module -by opening and selecting File Associations on the -Advanced tab. Alternatively, you can start it by +by opening and selecting File Associations in the +Application Appearance and Behavior category. Alternatively, you can start it by typing kcmshell4 filetypes from the terminal or . The file associations are organized into several categories, and
[kde-cli-tools] doc/kcontrol/filetypes: KControl -> Systemsettings
Git commit 5ba45a6b8a79fcd43552bfe8f852ff6088f88232 by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. KControl -> Systemsettings svn path=/trunk/KDE/kdebase/runtime/; revision=1052946 M +1-1doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/5ba45a6b8a79fcd43552bfe8f852ff6088f88232 diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index 6fcc804..b98a7ec 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -19,7 +19,7 @@ KDE -KControl +Systemsettings files association association
[kde-cli-tools] doc/kcontrol/filetypes: doc update
Git commit 1b22f504f27fdf4b06cb7f87d9ed02667e945775 by Burkhard Lück. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. doc update svn path=/trunk/KDE/kdebase/runtime/; revision=1008055 M +27 -24 doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/1b22f504f27fdf4b06cb7f87d9ed02667e945775 diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index 6744238..e06f6b8 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -14,8 +14,8 @@ -2003-10-13 -3.2 +2009-08-06 +4.3 KDE @@ -31,8 +31,8 @@ Introduction One of the most convenient aspects of , is its ability to -automatically match a data file, with its application. As an example, -when you click on your favorite document in , +automatically match a data file with its application. As an example, +when you click on your favorite document in the filemanager, automatically starts , and automatically loads that file into so you can begin working on it. @@ -66,6 +66,11 @@ without opening and analyzing the format of each and every file. How to use this module +You can start this module +by opening and selecting File Associations on the +Advanced tab. Alternatively, you can start it by +typing kcmshell4 filetypes from the terminal or . + The file associations are organized into several categories, and at a minimum you will have: @@ -84,10 +89,6 @@ at a minimum you will have: All of the file associations are sorted into one of these categories. -There is also an overview category All, which -displays all the file types in one list, without categorizing -them. - There is no functional difference between any of the categories. These categories are designed to help organize your file associations, but they do not alter the associations in any way. @@ -102,7 +103,7 @@ category name. You will be presented with a list of the associated mime-types under that category. You can also search for a particular type by using the -search box. The search box is labeled Find filename +search box. The search box is labeled Find file type or filename pattern and is located above the category list. Simply type the first letter of the type you are interested @@ -119,7 +120,7 @@ characters. If you want to add a new type to your file associations, you can click on the Add... button. A small dialog box will appear. You select the category from the drop down -box, and type the name in the blank labeled Type +box labeled Group, and type the name in the blank labeled Type name. Click OK to add the new mime type, or click Cancel to not add any new mime-types. @@ -159,7 +160,7 @@ the type will appear in the module window. Mime Type Icon is the icon that -will be visible when using as a file +will be visible when using or as a file manager. Filename Patterns is a search pattern which will use to determine the type. @@ -176,7 +177,7 @@ determines which applications will be associated with the specified Embedding Tab The Embedding tab allows you to determine if a file will be -viewed within a window, or by starting the +viewed within a filemanager window, or by starting the application. @@ -236,15 +237,15 @@ you, it does not affect the function of the type. Editing the application associations -There are four buttons (Move Up, -Move Down, Add and +There are five buttons (Move Up, +Move Down, Add, Edit and Remove) and a combo box (which lists the applications) which are used to configure the applications. The combo box lists all of the applications associated with a specific type. The list is in a specific order. The top application is the first application tried. The next application down -the list is the second, etc. +the list is the second, . What do you mean there is more than one application per type? Why is this necessary? @@ -259,10 +260,10 @@ system. As an example: For the type pdf, there are two applications associated with this file type. The first program is -called PS Viewer. If your system does not -have PS Viewer installed, then -automatically starts the second application Adobe Acrobat -Reader. As you can see, this will help keep running +called . If your system does not +have installed, then +automatically starts the second application . +As you can see, this will help keep running strong as you add and subtract applications. We have established that the order is important. You can change @@ -296,25 +297,27 @@ there will not be an application to view the data document. Embedding By clicking on the Embedding tab, you are presented with three radio buttons in the Left click -action group. These determine how views the selected +action group. These determine how the filemanager views the selected type: Show file in embedded viewer -If this is selected, the file will be shown within the window
[kde-cli-tools] doc/kcontrol/filetypes: Fix typos
Git commit 776cb91f0eeb1f6e82fc102df4fe55581a99e926 by Burkhard Lück, on behalf of Yuri Chornoivan. Committed on 10/11/2016 at 16:24. Pushed by lueck into branch 'master'. Fix typos svn path=/trunk/KDE/kdebase/runtime/; revision=894548 M +1-1doc/kcontrol/filetypes/index.docbook http://commits.kde.org/kde-cli-tools/776cb91f0eeb1f6e82fc102df4fe55581a99e926 diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook index a838156..6744238 100644 --- a/doc/kcontrol/filetypes/index.docbook +++ b/doc/kcontrol/filetypes/index.docbook @@ -175,7 +175,7 @@ determines which applications will be associated with the specified Embedding Tab -The Embedding tab allows you to determine if an file will be +The Embedding tab allows you to determine if a file will be viewed within a window, or by starting the application.
Re: Review Request 129364: Show part of the document ID for the pages found
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129364/#review100792 --- Ship it! patch makes the search results in khc much better - Burkhard Lück On Nov. 9, 2016, 12:17 vorm., Luigi Toscano wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129364/ > --- > > (Updated Nov. 9, 2016, 12:17 vorm.) > > > Review request for Documentation and Pino Toscano. > > > Repository: khelpcenter > > > Description > --- > > Extract the relevant part of the document ID (without the name of the page) > and show it before the name. The result of the man page indexer already > follows this pattern. > > > Diffs > - > > searchhandlers/xapiansearch.cpp 83bdeb4 > > Diff: https://git.reviewboard.kde.org/r/129364/diff/ > > > Testing > --- > > Compiles, the short name is shown in the search results. > > > Thanks, > > Luigi Toscano > >
[Differential] [Commented On] D3342: import kbookmarkmerger manpage from kde-baseapps + update to kf5
lueck added inline comments. INLINE COMMENTS > ltoscano wrote in man-kbookmarkmerger.1.docbook:45 > This is probably the good time to fix things like " is running" what provides the bookmark subsystem? plasma/workspace? REPOSITORY R227 KEditBookmarks REVISION DETAIL https://phabricator.kde.org/D3342 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation Cc: ltoscano
Review Request 129380: remove kcm docbooks which have their code in other repos from plasma-desktop
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129380/ --- Review request for Documentation, KDE Frameworks and Plasma. Bugs: 350619 https://bugs.kde.org/show_bug.cgi?id=350619 Repository: plasma-desktop Description --- remove kcm docbooks for cache, proxy, useragent, cookies, netpref, webshortcuts, smb these docbooks will be imported into frameworks/kio from kde-runtime master, see https://git.reviewboard.kde.org/r/128912/ remove kcm docbook for filetypes, this docbook will be imported into kde-cli-tools from kde-runtime master, see https://git.reviewboard.kde.org/r/128914/ Diffs - doc/kcontrol/CMakeLists.txt c057288 doc/kcontrol/cache/CMakeLists.txt 7728027 doc/kcontrol/cache/index.docbook a03658e doc/kcontrol/cookies/CMakeLists.txt 8f86430 doc/kcontrol/cookies/index.docbook a2379b9 doc/kcontrol/filetypes/CMakeLists.txt c6a6b24 doc/kcontrol/filetypes/index.docbook bf40a12 doc/kcontrol/netpref/CMakeLists.txt 42010fd doc/kcontrol/netpref/index.docbook 7db99a6 doc/kcontrol/proxy/CMakeLists.txt 37b19c9 doc/kcontrol/proxy/index.docbook a7bc293 doc/kcontrol/smb/CMakeLists.txt 3285ccf doc/kcontrol/smb/index.docbook f42f9a4 doc/kcontrol/useragent/CMakeLists.txt 35165d2 doc/kcontrol/useragent/index.docbook 6a816ab doc/kcontrol/webshortcuts/CMakeLists.txt 7324220 doc/kcontrol/webshortcuts/index.docbook bde3028 Diff: https://git.reviewboard.kde.org/r/129380/diff/ Testing --- builds Thanks, Burkhard Lück
Re: Review Request 129365: add encryption methods
> On Nov. 11, 2016, 10:29 vorm., Elvis Angelaccio wrote: > > File Attachment: create-protected-archive.png - create-protected-archive.png > > <https://git.reviewboard.kde.org/r/129365/#fcomment607> > > > > What about splitting this screenshot into 3 different ones? Each one > > would have only one section expanded (Compression, Password Protection and > > Multi-volume Archive) I am unsure if it makes sense to have 3 screenshots here, all possible options are shown in the uploaded screenshot. But I am open for your suggestion. @ Documentation team: please comment on this issue. > On Nov. 11, 2016, 10:29 vorm., Elvis Angelaccio wrote: > > doc/index.docbook, line 340 > > <https://git.reviewboard.kde.org/r/129365/diff/1/?file=484492#file484492line340> > > > > Technically only zip and *only with the p7zip backend*, but I supposed > > this can be omitted since p7zip is supposed to be the default. Btw we > > should also add a warning messagewidget in the dialog, since a zip with > > AES256 encryption cannot be unpacked by infozip's unzip. > > > > Not sure if this should be in the docbook... > Technically only zip and only with the p7zip backend, but I supposed this can > be omitted since p7zip is supposed to be the default. Too technical for Joe User, and if p7zip is the default, we do not need to add this info here. > Btw we should also add a warning messagewidget in the dialog, since a zip > with AES256 encryption cannot be unpacked by infozip's unzip. In recent ark master build from sources AES256 encryption as default for zip archives with password protection, but if a zip with this encryption cannot be unpacked by infozip's unzip, ark should offer another default encryption method for interoperability. If the user selects an uncommon option here, he should get a warning about possible problems opening this archive in other programms than ark. > Not sure if this should be in the docbook... We should add a warning about encryption methods which cannot be processed by common archive programms. AES128, AES192, AES256 and ZipCrypto are the available options, which are safe for interoperability, which are not? - Burkhard --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129365/#review100773 --- On Nov. 9, 2016, 8:46 nachm., Burkhard Lück wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129365/ > --- > > (Updated Nov. 9, 2016, 8:46 nachm.) > > > Review request for Documentation, KDE Utils, Elvis Angelaccio, and Ragnar > Thomsen. > > > Repository: ark > > > Description > --- > > see summary > update screenshot > remove obsolete menuitem "Add Folder" > > > Diffs > - > > doc/create-protected-archive.png abdec5d > doc/index.docbook 0b9516e > > Diff: https://git.reviewboard.kde.org/r/129365/diff/ > > > Testing > --- > > passes checkXML5 > > > File Attachments > > > create-protected-archive.png > > https://git.reviewboard.kde.org/media/uploaded/files/2016/11/09/45cda3df-d54d-4f66-a470-378763393c80__create-protected-archive.png > > > Thanks, > > Burkhard Lück > >
Re: Review Request 129377: Remove trash kcm docbook from kio-extras
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129377/ --- (Updated Nov. 11, 2016, 4:12 nachm.) Review request for Documentation, Plasma and Aleix Pol Gonzalez. Changes --- add dependend RR https://git.reviewboard.kde.org/r/128912/ Repository: kio-extras Description --- the trash kcm docbook will be imported from kde-runtime master with history into frameworks/kio where the code is, see https://git.reviewboard.kde.org/r/128912/ this docbook was imported into kio-extras with https://cgit.kde.org/kio-extras.git/commit/doc/kcontrol/trash/index.docbook?id=09cd27cca7daa2339960efa0ab852ad492b5ac97 but why? Diffs - doc/CMakeLists.txt 0afa5b5 doc/kcontrol/CMakeLists.txt fe7c777 doc/kcontrol/trash/CMakeLists.txt 6790c61 doc/kcontrol/trash/index.docbook d550b1b Diff: https://git.reviewboard.kde.org/r/129377/diff/ Testing --- builds Thanks, Burkhard Lück
Review Request 129377: Remove trash kcm docbook from kio-extras
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129377/ --- Review request for Documentation, Plasma and Aleix Pol Gonzalez. Repository: kio-extras Description --- the trash kcm docbook will be imported from kde-runtime master with history into frameworks/kio where the code is, see https://git.reviewboard.kde.org/r/128912/ this docbook was imported into kio-extras with https://cgit.kde.org/kio-extras.git/commit/doc/kcontrol/trash/index.docbook?id=09cd27cca7daa2339960efa0ab852ad492b5ac97 but why? Diffs - doc/CMakeLists.txt 0afa5b5 doc/kcontrol/CMakeLists.txt fe7c777 doc/kcontrol/trash/CMakeLists.txt 6790c61 doc/kcontrol/trash/index.docbook d550b1b Diff: https://git.reviewboard.kde.org/r/129377/diff/ Testing --- builds Thanks, Burkhard Lück
[Differential] [Request, 115 lines] D3343: Remove man page for kbookmarkmerger from konqueror repo
lueck created this revision. lueck added reviewers: dfaure, Documentation. lueck set the repository for this revision to R226 Konqueror. REVISION SUMMARY Remove the man page, it is imported to the repo keditbookmarks, where the code is TEST PLAN builds REPOSITORY R226 Konqueror REVISION DETAIL https://phabricator.kde.org/D3343 AFFECTED FILES doc/CMakeLists.txt doc/man-kbookmarkmerger.1.docbook EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
Re: Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128912/ --- (Updated Nov. 11, 2016, 3:39 nachm.) Review request for Documentation, KDE Frameworks and Plasma. Repository: kio Description --- doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ doc/kcontrol/ebrowsing/ doc/kcontrol/smb/ splitted from kde-runtime master using https://github.com/ajdruff/git-splits Not included in build so far, the docbooks are imported as they were splitted To be done next: Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5, rename ebrowsing to webshortcuts reapply a few updates done in plasma-desktop remove these imported kcontrol docbooks from plasma-desktop adapt scripty to these changes Diffs - docs/CMakeLists.txt 350bce3 docs/kcontrol5/CMakeLists.txt PRE-CREATION docs/kcontrol5/cache/CMakeLists.txt PRE-CREATION docs/kcontrol5/cache/index.docbook PRE-CREATION docs/kcontrol5/cookies/CMakeLists.txt PRE-CREATION docs/kcontrol5/cookies/index.docbook PRE-CREATION docs/kcontrol5/netpref/CMakeLists.txt PRE-CREATION docs/kcontrol5/netpref/index.docbook PRE-CREATION docs/kcontrol5/proxy/CMakeLists.txt PRE-CREATION docs/kcontrol5/proxy/index.docbook PRE-CREATION docs/kcontrol5/smb/CMakeLists.txt PRE-CREATION docs/kcontrol5/smb/index.docbook PRE-CREATION docs/kcontrol5/trash/CMakeLists.txt PRE-CREATION docs/kcontrol5/trash/index.docbook PRE-CREATION docs/kcontrol5/useragent/CMakeLists.txt PRE-CREATION docs/kcontrol5/useragent/index.docbook PRE-CREATION docs/kcontrol5/webshortcuts/CMakeLists.txt PRE-CREATION docs/kcontrol5/webshortcuts/index.docbook PRE-CREATION src/ioslaves/trash/kcmtrash.desktop c8ff4ac src/kcms/kio/cache.desktop f0bd261 src/kcms/kio/cookies.desktop f91b5cd src/kcms/kio/netpref.desktop 963ef3f src/kcms/kio/proxy.desktop c11451d src/kcms/kio/smb.desktop c323614 src/kcms/kio/useragent.desktop 856e9cc src/kcms/webshortcuts/webshortcuts.desktop 24fbb2a Diff: https://git.reviewboard.kde.org/r/128912/diff/ Testing --- history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime master File Attachments (updated) git-log-doc-kcontrol.output https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output kio-log-docs.txt https://git.reviewboard.kde.org/media/uploaded/files/2016/11/11/911e5e67-3094-4d47-aa94-95129f5545fe__kio-log-docs.txt Thanks, Burkhard Lück
Re: Review Request 128914: Import filetypes kcm docbook from kde-runtime master to kde-cli-tools with the code
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128914/ --- (Updated Nov. 11, 2016, 3:38 nachm.) Review request for Documentation, Localization and Translation (l10n) and Plasma. Repository: kde-cli-tools Description --- doc/kcontrol/filetypes/ splitted from kde-runtime master using https://github.com/ajdruff/git-splits Not included in build so far, the docbook ismported as it was splitted To be done next: adapt CMakeLists.txt, change dtd to kf5, reapply one update done in plasma-desktop make co-installable, see https://git.reviewboard.kde.org/r/128912/ remove this imported kcontrol docbook from plasma-desktop adapt scripty to these changes Diffs - doc/CMakeLists.txt 6987c14 doc/kcontrol5/CMakeLists.txt PRE-CREATION doc/kcontrol5/filetypes/CMakeLists.txt PRE-CREATION doc/kcontrol5/filetypes/index.docbook PRE-CREATION keditfiletype/filetypes.desktop 76f11cf Diff: https://git.reviewboard.kde.org/r/128914/diff/ Testing --- history looks good, see git-log-doc-kcontrol-kio-cli-tools.output, same log in kde-runtime master File Attachments (updated) git-log-doc-kcontrol-kio-cli-tools.output https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/32f72127-aa97-4393-88e1-d830e35dbfe2__git-log-doc-kcontrol-kio-cli-tools.output kde-cli-tools-log-doc.txt https://git.reviewboard.kde.org/media/uploaded/files/2016/11/11/436b0736-a2e8-46af-b335-36495b824d20__kde-cli-tools-log-doc.txt Thanks, Burkhard Lück
[Differential] [Request, 114 lines] D3342: import kbookmarkmerger manpage from kde-baseapps + update to kf5
lueck created this revision. lueck added reviewers: dfaure, Documentation. lueck set the repository for this revision to R227 KEditBookmarks. REVISION SUMMARY imported from kde-baseapps to get the history with git log follow, this did not work for me importing from konqueror repo added to the build updated to kf5 bump date+releaseinfo remove Qt Options + KDE Options add kf5options no qt5options because this is no gui application diff to the manpage in konqueror/kde-baseapps see https://paste.kde.org/peye8i3dh TEST PLAN builds REPOSITORY R227 KEditBookmarks REVISION DETAIL https://phabricator.kde.org/D3342 AFFECTED FILES doc/CMakeLists.txt doc/man-kbookmarkmerger.1.docbook EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
Re: Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master
> On Nov. 11, 2016, 1:51 nachm., Luigi Toscano wrote: > > If I understand it correctly, the review include two separate change > > (import + fixes), is it correct? Then it's fine by me (pending confirmation > > for the shipit), the changes are fine and we can refine it later (better > > than the current situation). Thes are two separate changes, the import + update in one RR, see kio-log-docs.txt -> less trouble with scripty - Burkhard --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128912/#review100778 --- On Nov. 11, 2016, 9:31 vorm., Burkhard Lück wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/128912/ > --- > > (Updated Nov. 11, 2016, 9:31 vorm.) > > > Review request for Documentation, KDE Frameworks and Plasma. > > > Repository: kio > > > Description > --- > > doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent > doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ > doc/kcontrol/ebrowsing/ doc/kcontrol/smb/ > splitted from kde-runtime master using https://github.com/ajdruff/git-splits > > Not included in build so far, the docbooks are imported as they were splitted > > To be done next: > Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5, > rename ebrowsing to webshortcuts > reapply a few updates done in plasma-desktop > remove these imported kcontrol docbooks from plasma-desktop > adapt scripty to these changes > > > Diffs > - > > docs/CMakeLists.txt 350bce3 > docs/kcontrol5/CMakeLists.txt PRE-CREATION > docs/kcontrol5/cache/CMakeLists.txt PRE-CREATION > docs/kcontrol5/cache/index.docbook PRE-CREATION > docs/kcontrol5/cookies/CMakeLists.txt PRE-CREATION > docs/kcontrol5/cookies/index.docbook PRE-CREATION > docs/kcontrol5/netpref/CMakeLists.txt PRE-CREATION > docs/kcontrol5/netpref/index.docbook PRE-CREATION > docs/kcontrol5/proxy/CMakeLists.txt PRE-CREATION > docs/kcontrol5/proxy/index.docbook PRE-CREATION > docs/kcontrol5/smb/CMakeLists.txt PRE-CREATION > docs/kcontrol5/smb/index.docbook PRE-CREATION > docs/kcontrol5/trash/CMakeLists.txt PRE-CREATION > docs/kcontrol5/trash/index.docbook PRE-CREATION > docs/kcontrol5/useragent/CMakeLists.txt PRE-CREATION > docs/kcontrol5/useragent/index.docbook PRE-CREATION > docs/kcontrol5/webshortcuts/CMakeLists.txt PRE-CREATION > docs/kcontrol5/webshortcuts/index.docbook PRE-CREATION > src/ioslaves/trash/kcmtrash.desktop c8ff4ac > src/kcms/kio/cache.desktop f0bd261 > src/kcms/kio/cookies.desktop f91b5cd > src/kcms/kio/netpref.desktop 963ef3f > src/kcms/kio/proxy.desktop c11451d > src/kcms/kio/smb.desktop c323614 > src/kcms/kio/useragent.desktop 856e9cc > src/kcms/webshortcuts/webshortcuts.desktop 24fbb2a > > Diff: https://git.reviewboard.kde.org/r/128912/diff/ > > > Testing > --- > > history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime > master > > > File Attachments > > > git-log-doc-kcontrol.output > > https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output > > > Thanks, > > Burkhard Lück > >
Re: Review Request 128914: Import filetypes kcm docbook from kde-runtime master to kde-cli-tools with the code
> On Nov. 11, 2016, 1:51 nachm., Luigi Toscano wrote: > > If I understand it correctly, the review include two separate change > > (import + fixes), is it correct? Then it's fine by me (pending confirmation > > for the shipit), the changes are fine and we can refine it later (better > > than the current situation). Yes thes are two separate changes, the import + update in one RR, see kde-cli-tools-log-doc.txt That way we have less trouble with scripty - Burkhard --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128914/#review100777 --- On Nov. 11, 2016, 9:02 vorm., Burkhard Lück wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/128914/ > --- > > (Updated Nov. 11, 2016, 9:02 vorm.) > > > Review request for Documentation, Localization and Translation (l10n) and > Plasma. > > > Repository: kde-cli-tools > > > Description > --- > > doc/kcontrol/filetypes/ splitted from kde-runtime master using > https://github.com/ajdruff/git-splits > > Not included in build so far, the docbook ismported as it was splitted > > To be done next: > adapt CMakeLists.txt, change dtd to kf5, > reapply one update done in plasma-desktop > make co-installable, see https://git.reviewboard.kde.org/r/128912/ > remove this imported kcontrol docbook from plasma-desktop > adapt scripty to these changes > > > Diffs > - > > doc/CMakeLists.txt 6987c14 > doc/kcontrol5/CMakeLists.txt PRE-CREATION > doc/kcontrol5/filetypes/CMakeLists.txt PRE-CREATION > doc/kcontrol5/filetypes/index.docbook PRE-CREATION > keditfiletype/filetypes.desktop 76f11cf > > Diff: https://git.reviewboard.kde.org/r/128914/diff/ > > > Testing > --- > > history looks good, see git-log-doc-kcontrol-kio-cli-tools.output, same log > in kde-runtime master > > > File Attachments > > > git-log-doc-kcontrol-kio-cli-tools.output > > https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/32f72127-aa97-4393-88e1-d830e35dbfe2__git-log-doc-kcontrol-kio-cli-tools.output > > > Thanks, > > Burkhard Lück > >
[Differential] [Closed] D3310: update imported kcm docbooks to kf5
This revision was automatically updated to reflect the committed changes. Closed by commit R226:bf6457d78a1c: update imported kcm docbooks to kf5 (authored by lueck). CHANGED PRIOR TO COMMIT https://phabricator.kde.org/D3310?vs=8021=8095#toc REPOSITORY R226 Konqueror CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3310?vs=8021=8095 REVISION DETAIL https://phabricator.kde.org/D3310 AFFECTED FILES CMakeLists.txt doc/CMakeLists.txt doc/kcontrol/bookmarks/CMakeLists.txt doc/kcontrol/bookmarks/index.docbook doc/kcontrol/filemanager/CMakeLists.txt doc/kcontrol/filemanager/index.docbook doc/kcontrol/history/CMakeLists.txt doc/kcontrol/history/index.docbook doc/kcontrol/kcmcss/CMakeLists.txt doc/kcontrol/kcmcss/index.docbook doc/kcontrol/khtml-adblock/CMakeLists.txt doc/kcontrol/khtml-adblock/index.docbook doc/kcontrol/khtml-behavior/CMakeLists.txt doc/kcontrol/khtml-behavior/index.docbook doc/kcontrol/khtml-general/CMakeLists.txt doc/kcontrol/khtml-general/index.docbook doc/kcontrol/khtml-java-js/CMakeLists.txt doc/kcontrol/khtml-java-js/index.docbook doc/kcontrol/performance/CMakeLists.txt doc/kcontrol/performance/index.docbook doc/kcontrol5/CMakeLists.txt doc/kcontrol5/bookmarks/CMakeLists.txt doc/kcontrol5/bookmarks/index.docbook doc/kcontrol5/filemanager/CMakeLists.txt doc/kcontrol5/filemanager/index.docbook doc/kcontrol5/history/CMakeLists.txt doc/kcontrol5/history/index.docbook doc/kcontrol5/kcmcss/CMakeLists.txt doc/kcontrol5/kcmcss/index.docbook doc/kcontrol5/khtml-adblock/CMakeLists.txt doc/kcontrol5/khtml-adblock/index.docbook doc/kcontrol5/khtml-behavior/CMakeLists.txt doc/kcontrol5/khtml-behavior/index.docbook doc/kcontrol5/khtml-general/CMakeLists.txt doc/kcontrol5/khtml-general/index.docbook doc/kcontrol5/khtml-java-js/CMakeLists.txt doc/kcontrol5/khtml-java-js/index.docbook doc/kcontrol5/performance/CMakeLists.txt doc/kcontrol5/performance/index.docbook doc/man-kbookmarkmerger.1.docbook settings/bookmarks/bookmarks.desktop settings/konq/filebehavior.desktop settings/konqhtml/khtml_behavior.desktop settings/konqhtml/khtml_filter.desktop settings/konqhtml/khtml_general.desktop settings/konqhtml/khtml_java_js.desktop sidebar/history_module/kcmhistory.desktop EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation, ltoscano Cc: ltoscano
[konqueror] /: update imported kcm docbooks to kf5
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-1CMakeLists.txt
M +1-1doc/CMakeLists.txt
D +0-2doc/kcontrol/bookmarks/CMakeLists.txt
D +0-2doc/kcontrol/filemanager/CMakeLists.txt
D +0-2doc/kcontrol/history/CMakeLists.txt
D +0-2doc/kcontrol/kcmcss/CMakeLists.txt
D +0-2doc/kcontrol/khtml-adblock/CMakeLists.txt
D +0-2doc/kcontrol/khtml-behavior/CMakeLists.txt
D +0-2doc/kcontrol/khtml-general/CMakeLists.txt
D +0-2doc/kcontrol/khtml-java-js/CMakeLists.txt
D +0-2doc/kcontrol/performance/CMakeLists.txt
D +0-91 doc/kcontrol/performance/index.docbook
A +9-0doc/kcontrol5/CMakeLists.txt
A +2-0doc/kcontrol5/bookmarks/CMakeLists.txt
R +5-4doc/kcontrol5/bookmarks/index.docbook [from:
doc/kcontrol/bookmarks/index.docbook - 094% similarity]
A +2-0doc/kcontrol5/filemanager/CMakeLists.txt
R +4-4doc/kcontrol5/filemanager/index.docbook [from:
doc/kcontrol/filemanager/index.docbook - 092% similarity]
A +2-0doc/kcontrol5/history/CMakeLists.txt
R +2-2doc/kcontrol5/history/index.docbook [from:
doc/kcontrol/history/index.docbook - 095% similarity]
A +2-0doc/kcontrol5/kcmcss/CMakeLists.txt
R +5-5doc/kcontrol5/kcmcss/index.docbook [from:
doc/kcontrol/kcmcss/index.docbook - 098% similarity]
A +2-0doc/kcontrol5/khtml-adblock/CMakeLists.txt
R +4-8doc/kcontrol5/khtml-adblock/index.docbook [from:
doc/kcontrol/khtml-adblock/index.docbook - 091% similarity]
A +2-0doc/kcontrol5/khtml-behavior/CMakeLists.txt
R +4-5doc/kcontrol5/khtml-behavior/index.docbook [from:
doc/kcontrol/khtml-behavior/index.docbook - 094% similarity]
A +2-0doc/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-0doc/kcontrol5/khtml-java-js/CMakeLists.txt
R +4-5doc/kcontrol5/khtml-java-js/index.docbook [from:
doc/kcontrol/khtml-java-js/index.docbook - 096% similarity]
A +2-0doc/kcontrol5/performance/CMakeLists.txt
A +46 -0doc/kcontrol5/performance/index.docbook
M +7-5doc/man-kbookmarkmerger.1.docbook
M +1-1settings/bookmarks/bookmarks.desktop
M +1-1settings/konq/filebehavior.desktop
M +1-1settings/konqhtml/khtml_behavior.desktop
M +1-1settings/konqhtml/khtml_filter.desktop
M +1-1settings/konqhtml/khtml_general.desktop
M +1-1settings/konqhtml/khtml_java_js.desktop
M +1-1sidebar/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..000
--- a/doc/kcontrol/bookmarks/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-### ins
Re: Review Request 129326: Update/proofread Okular docbooks to kf5
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129326/ --- (Updated Nov. 11, 2016, 2:26 p.m.) Status -- This change has been marked as submitted. Review request for Documentation, Okular and Albert Astals Cid. Changes --- Submitted with commit 3f8d9f760c9dbd5c4969e07805da25f0fde3f826 by Burkhard Lück to branch master. Repository: okular Description --- remove entities kappname, package, PDF - unused or already defined in kdoctools bum date + releaseinfo - is version 1.0 correct for 16.12? add missing shortcuts add "Drawing Tool Configuration" remove appendix installation update man page - remove kde4 options + add qt5options+kf5options Diffs - doc/index.docbook 81eca45 doc/man-okular.1.docbook ecfda1e Diff: https://git.reviewboard.kde.org/r/129326/diff/ Testing --- builds Thanks, Burkhard Lück
[okular] doc: Update/proofread Okular docbooks to kf5
Git commit 3f8d9f760c9dbd5c4969e07805da25f0fde3f826 by Burkhard Lück. Committed on 11/11/2016 at 14:26. Pushed by lueck into branch 'master'. Update/proofread Okular docbooks to kf5 remove entities kappname, package, PDF - unused or already defined in kdoctools bum date + releaseinfo - is version 1.0 correct for 16.12? add missing shortcuts add 'Drawing Tool Configuration' remove appendix installation update man page - remove kde4 options + add qt5options+kf5options REVIEW:129326 M +16 -70 doc/index.docbook M +13 -60 doc/man-okular.1.docbook http://commits.kde.org/okular/3f8d9f760c9dbd5c4969e07805da25f0fde3f826 diff --git a/doc/index.docbook b/doc/index.docbook index 81eca45..9c8c4e1 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,10 +1,7 @@ ATEX"> - KPDF"> - PDF"> ]> @@ -37,8 +34,8 @@ Context menu actions like Rename Bookmarks etc.) - 2016-07-26 - 0.26 (Applications 16.08) + 2016-11-04 + 1.0 (Applications 16.12) is a universal document viewer based on code. @@ -889,42 +886,7 @@ Context menu actions like Rename Bookmarks etc.) okular - --help - This lists the most basic options available at the command line. - - - okular - --help-qt - This lists the options available for changing the way interacts with . - - - okular - --help-kde - This lists the options available for changing the way interacts with . - - - okular - --help-all - This lists all of the command line options. - - - okular - --author - Lists 's authors in the terminal window - - - okular - -v, --version - Lists version information for , , and . Also available through okular -v - - - okular - --license - Shows license information. - - - okular - --page number + -p --page number Open a page with a given number in the document. Also available through okular -p number @@ -946,12 +908,7 @@ Context menu actions like Rename Bookmarks etc.) okular --noraise Allows to prevent window raising after the start. - - - okular - -- - End of options. - + @@ -1037,6 +994,9 @@ Context menu actions like Rename Bookmarks etc.) + + S + File Save As... @@ -1054,6 +1014,9 @@ Context menu actions like Rename Bookmarks etc.) + + S + File Save Copy As... @@ -2273,12 +2236,6 @@ Context menu action
[Differential] [Commented On] D3310: update imported kcm docbooks to kf5
lueck added a comment. Please review, string freeze for 16.12 is comming in a few days... REPOSITORY R226 Konqueror REVISION DETAIL https://phabricator.kde.org/D3310 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
Re: Review Request 129365: add encryption methods
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129365/#review100771 --- Please review, string freeze for 16.12 is comming in a few days... - Burkhard Lück On Nov. 9, 2016, 8:46 nachm., Burkhard Lück wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129365/ > --- > > (Updated Nov. 9, 2016, 8:46 nachm.) > > > Review request for Documentation, KDE Utils, Elvis Angelaccio, and Ragnar > Thomsen. > > > Repository: ark > > > Description > --- > > see summary > update screenshot > remove obsolete menuitem "Add Folder" > > > Diffs > - > > doc/create-protected-archive.png abdec5d > doc/index.docbook 0b9516e > > Diff: https://git.reviewboard.kde.org/r/129365/diff/ > > > Testing > --- > > passes checkXML5 > > > File Attachments > > > create-protected-archive.png > > https://git.reviewboard.kde.org/media/uploaded/files/2016/11/09/45cda3df-d54d-4f66-a470-378763393c80__create-protected-archive.png > > > Thanks, > > Burkhard Lück > >
Re: Review Request 129326: Update/proofread Okular docbooks to kf5
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129326/#review100770 --- Please review, string freeze for 16.12 is comming in a few days... - Burkhard Lück On Nov. 4, 2016, 9:39 vorm., Burkhard Lück wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129326/ > --- > > (Updated Nov. 4, 2016, 9:39 vorm.) > > > Review request for Documentation, Okular and Albert Astals Cid. > > > Repository: okular > > > Description > --- > > remove entities kappname, package, PDF - unused or already defined in > kdoctools > bum date + releaseinfo - is version 1.0 correct for 16.12? > add missing shortcuts > add "Drawing Tool Configuration" > remove appendix installation > update man page - remove kde4 options + add qt5options+kf5options > > > Diffs > - > > doc/index.docbook 81eca45 > doc/man-okular.1.docbook ecfda1e > > Diff: https://git.reviewboard.kde.org/r/129326/diff/ > > > Testing > --- > > builds > > > Thanks, > > Burkhard Lück > >
Re: Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128912/ --- (Updated Nov. 11, 2016, 9:31 vorm.) Review request for Documentation, KDE Frameworks and Plasma. Changes --- Update import because I misssed the trash kcm docbook 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 adapt X-DocPath in desktop files Repository: kio Description --- doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ doc/kcontrol/ebrowsing/ doc/kcontrol/smb/ splitted from kde-runtime master using https://github.com/ajdruff/git-splits Not included in build so far, the docbooks are imported as they were splitted To be done next: Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5, rename ebrowsing to webshortcuts reapply a few updates done in plasma-desktop remove these imported kcontrol docbooks from plasma-desktop adapt scripty to these changes Diffs (updated) - docs/CMakeLists.txt 350bce3 docs/kcontrol5/CMakeLists.txt PRE-CREATION docs/kcontrol5/cache/CMakeLists.txt PRE-CREATION docs/kcontrol5/cache/index.docbook PRE-CREATION docs/kcontrol5/cookies/CMakeLists.txt PRE-CREATION docs/kcontrol5/cookies/index.docbook PRE-CREATION docs/kcontrol5/netpref/CMakeLists.txt PRE-CREATION docs/kcontrol5/netpref/index.docbook PRE-CREATION docs/kcontrol5/proxy/CMakeLists.txt PRE-CREATION docs/kcontrol5/proxy/index.docbook PRE-CREATION docs/kcontrol5/smb/CMakeLists.txt PRE-CREATION docs/kcontrol5/smb/index.docbook PRE-CREATION docs/kcontrol5/trash/CMakeLists.txt PRE-CREATION docs/kcontrol5/trash/index.docbook PRE-CREATION docs/kcontrol5/useragent/CMakeLists.txt PRE-CREATION docs/kcontrol5/useragent/index.docbook PRE-CREATION docs/kcontrol5/webshortcuts/CMakeLists.txt PRE-CREATION docs/kcontrol5/webshortcuts/index.docbook PRE-CREATION src/ioslaves/trash/kcmtrash.desktop c8ff4ac src/kcms/kio/cache.desktop f0bd261 src/kcms/kio/cookies.desktop f91b5cd src/kcms/kio/netpref.desktop 963ef3f src/kcms/kio/proxy.desktop c11451d src/kcms/kio/smb.desktop c323614 src/kcms/kio/useragent.desktop 856e9cc src/kcms/webshortcuts/webshortcuts.desktop 24fbb2a Diff: https://git.reviewboard.kde.org/r/128912/diff/ Testing --- history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime master File Attachments git-log-doc-kcontrol.output https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output Thanks, Burkhard Lück
Re: Review Request 128914: Import filetypes kcm docbook from kde-runtime master to kde-cli-tools with the code
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128914/ --- (Updated Nov. 11, 2016, 9:02 vorm.) Review request for Documentation, Localization and Translation (l10n) and Plasma. Changes --- Update imported filetypes kcm docbook adapt CMakeLists.txt, change dtd to kf5 reapply one update done in plasma-desktop proofread, bump date + releaseinfo make co-installable using subdir kcontrol5 Repository: kde-cli-tools Description --- doc/kcontrol/filetypes/ splitted from kde-runtime master using https://github.com/ajdruff/git-splits Not included in build so far, the docbook ismported as it was splitted To be done next: adapt CMakeLists.txt, change dtd to kf5, reapply one update done in plasma-desktop make co-installable, see https://git.reviewboard.kde.org/r/128912/ remove this imported kcontrol docbook from plasma-desktop adapt scripty to these changes Diffs (updated) - doc/CMakeLists.txt 6987c14 doc/kcontrol5/CMakeLists.txt PRE-CREATION doc/kcontrol5/filetypes/CMakeLists.txt PRE-CREATION doc/kcontrol5/filetypes/index.docbook PRE-CREATION keditfiletype/filetypes.desktop 76f11cf Diff: https://git.reviewboard.kde.org/r/128914/diff/ Testing --- history looks good, see git-log-doc-kcontrol-kio-cli-tools.output, same log in kde-runtime master File Attachments git-log-doc-kcontrol-kio-cli-tools.output https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/32f72127-aa97-4393-88e1-d830e35dbfe2__git-log-doc-kcontrol-kio-cli-tools.output Thanks, Burkhard Lück
Review Request 129365: add encryption methods
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129365/ --- Review request for Documentation, KDE Utils, Elvis Angelaccio, and Ragnar Thomsen. Repository: ark Description --- see summary update screenshot remove obsolete menuitem "Add Folder" Diffs - doc/create-protected-archive.png abdec5d doc/index.docbook 0b9516e Diff: https://git.reviewboard.kde.org/r/129365/diff/ Testing --- passes checkXML5 File Attachments create-protected-archive.png https://git.reviewboard.kde.org/media/uploaded/files/2016/11/09/45cda3df-d54d-4f66-a470-378763393c80__create-protected-archive.png Thanks, Burkhard Lück
Re: Review Request 129364: Show part of the document ID for the pages found
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129364/#review100740 --- +1 lgtm - Burkhard Lück On Nov. 9, 2016, 12:17 vorm., Luigi Toscano wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129364/ > --- > > (Updated Nov. 9, 2016, 12:17 vorm.) > > > Review request for Documentation and Pino Toscano. > > > Repository: khelpcenter > > > Description > --- > > Extract the relevant part of the document ID (without the name of the page) > and show it before the name. The result of the man page indexer already > follows this pattern. > > > Diffs > - > > searchhandlers/xapiansearch.cpp 83bdeb4 > > Diff: https://git.reviewboard.kde.org/r/129364/diff/ > > > Testing > --- > > Compiles, the short name is shown in the search results. > > > Thanks, > > Luigi Toscano > >
[kdelibs4support] /: Rename subdir kcontrol to kcontrol5
Git commit 6b9d09c107e90c667ef3884b7e00796292ad6539 by Burkhard Lück.
Committed on 08/11/2016 at 16:14.
Pushed by lueck into branch 'master'.
Rename subdir kcontrol to kcontrol5
in distributions the doc packages for kdelibs4support and kde-runtime are
usually designed to be co-installable,
but this fails in some distributions due to conflicting file paths, therefore:
* subdir kcontrol is renamed to kcontrol5
* install target for kcm_ssl docbook changed to kcontrol5
* X-DocPath changed to kcontrol5/kcm_ssl/index.html
REVIEW:129209
M +1-1docs/CMakeLists.txt
R +0-0docs/kcontrol5/CMakeLists.txt [from:
docs/kcontrol/CMakeLists.txt - 100% similarity]
R +1-1docs/kcontrol5/kcm_ssl/CMakeLists.txt [from:
docs/kcontrol/kcm_ssl/CMakeLists.txt - 066% similarity]
R +---docs/kcontrol5/kcm_ssl/details.png [from:
docs/kcontrol/kcm_ssl/details.png - 100% similarity]
R +0-0docs/kcontrol5/kcm_ssl/index.docbook [from:
docs/kcontrol/kcm_ssl/index.docbook - 100% similarity]
R +---docs/kcontrol5/kcm_ssl/module.png [from:
docs/kcontrol/kcm_ssl/module.png - 100% similarity]
M +1-1src/kssl/kcm/kcm_ssl.desktop
http://commits.kde.org/kdelibs4support/6b9d09c107e90c667ef3884b7e00796292ad6539
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index f90fa81..3743811 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(kf5-config)
add_subdirectory(kdebugdialog5)
-add_subdirectory(kcontrol)
+add_subdirectory(kcontrol5)
diff --git a/docs/kcontrol/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
similarity index 100%
rename from docs/kcontrol/CMakeLists.txt
rename to docs/kcontrol5/CMakeLists.txt
diff --git a/docs/kcontrol/kcm_ssl/CMakeLists.txt
b/docs/kcontrol5/kcm_ssl/CMakeLists.txt
similarity index 66%
rename from docs/kcontrol/kcm_ssl/CMakeLists.txt
rename to docs/kcontrol5/kcm_ssl/CMakeLists.txt
index 4d3bc75..793a699 100644
--- a/docs/kcontrol/kcm_ssl/CMakeLists.txt
+++ b/docs/kcontrol5/kcm_ssl/CMakeLists.txt
@@ -1,2 +1,2 @@
### install files ###
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION
${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcm_ssl)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION
${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/kcm_ssl)
diff --git a/docs/kcontrol/kcm_ssl/details.png
b/docs/kcontrol5/kcm_ssl/details.png
similarity index 100%
rename from docs/kcontrol/kcm_ssl/details.png
rename to docs/kcontrol5/kcm_ssl/details.png
diff --git a/docs/kcontrol/kcm_ssl/index.docbook
b/docs/kcontrol5/kcm_ssl/index.docbook
similarity index 100%
rename from docs/kcontrol/kcm_ssl/index.docbook
rename to docs/kcontrol5/kcm_ssl/index.docbook
diff --git a/docs/kcontrol/kcm_ssl/module.png
b/docs/kcontrol5/kcm_ssl/module.png
similarity index 100%
rename from docs/kcontrol/kcm_ssl/module.png
rename to docs/kcontrol5/kcm_ssl/module.png
diff --git a/src/kssl/kcm/kcm_ssl.desktop b/src/kssl/kcm/kcm_ssl.desktop
index 6ec8be6..bd29330 100644
--- a/src/kssl/kcm/kcm_ssl.desktop
+++ b/src/kssl/kcm/kcm_ssl.desktop
@@ -8,7 +8,7 @@ X-KDE-Library=kcm_ssl
X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=networksettings
X-KDE-Weight=70
-X-DocPath=kcontrol/kcm_ssl/index.html
+X-DocPath=kcontrol5/kcm_ssl/index.html
Name=SSL Preferences
Name[ar]=تفضيلات SSL
Re: Review Request 129209: Rename subdir kcontrol to kcontrol5
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129209/ --- (Updated Nov. 8, 2016, 5:15 p.m.) Status -- This change has been marked as submitted. Review request for Documentation and KDE Frameworks. Changes --- Submitted with commit 6b9d09c107e90c667ef3884b7e00796292ad6539 by Burkhard Lück to branch master. Repository: kdelibs4support Description --- in distributions the doc packages for kdelibs4support and kde-runtime are usually designed to be co-installable, but this fails in some distributions due to conflicting file paths, therefore: * subdir kcontrol is renamed to kcontrol5 * install target for kcm_ssl docbook changed to kcontrol5 * X-DocPath changed to kcontrol5/kcm_ssl/index.html Diffs - docs/CMakeLists.txt f90fa81 docs/kcontrol/CMakeLists.txt docs/kcontrol/kcm_ssl/CMakeLists.txt docs/kcontrol/kcm_ssl/details.png docs/kcontrol/kcm_ssl/index.docbook docs/kcontrol/kcm_ssl/module.png docs/kcontrol5/kcm_ssl/CMakeLists.txt 4d3bc75 src/kssl/kcm/kcm_ssl.desktop 6ec8be6 Diff: https://git.reviewboard.kde.org/r/129209/diff/ Testing --- builds and installs properly Thanks, Burkhard Lück
[plasma-desktop] doc/kcontrol: Remove Konqueror kcm docbooks from plasma-desktop repo
Git commit daef6a7178982be93025a25d7f97071c35242547 by Burkhard Lück.
Committed on 08/11/2016 at 15:15.
Pushed by lueck into branch 'master'.
Remove Konqueror kcm docbooks from plasma-desktop repo
Code for these kcms is in the new konqueror repo and the docbooks have been
imported with history from kde-runtime into the konqueror repo
REVIEW:128907
M +0-10 doc/kcontrol/CMakeLists.txt
D +0-2doc/kcontrol/bookmarks/CMakeLists.txt
D +0-101 doc/kcontrol/bookmarks/index.docbook
D +0-2doc/kcontrol/filemanager/CMakeLists.txt
D +0-61 doc/kcontrol/filemanager/index.docbook
D +0-2doc/kcontrol/history/CMakeLists.txt
D +0-62 doc/kcontrol/history/index.docbook
D +0-2doc/kcontrol/kcmcss/CMakeLists.txt
D +0-367 doc/kcontrol/kcmcss/index.docbook
D +0-2doc/kcontrol/khtml-adblock/CMakeLists.txt
D +0-90 doc/kcontrol/khtml-adblock/index.docbook
D +0-2doc/kcontrol/khtml-behavior/CMakeLists.txt
D +0-96 doc/kcontrol/khtml-behavior/index.docbook
D +0-2doc/kcontrol/khtml-general/CMakeLists.txt
D +0-135 doc/kcontrol/khtml-general/index.docbook
D +0-2doc/kcontrol/khtml-java-js/CMakeLists.txt
D +0-145 doc/kcontrol/khtml-java-js/index.docbook
D +0-2doc/kcontrol/khtml-plugins/CMakeLists.txt
D +0-149 doc/kcontrol/khtml-plugins/index.docbook
D +0-2doc/kcontrol/performance/CMakeLists.txt
D +0-91 doc/kcontrol/performance/index.docbook
http://commits.kde.org/plasma-desktop/daef6a7178982be93025a25d7f97071c35242547
diff --git a/doc/kcontrol/CMakeLists.txt b/doc/kcontrol/CMakeLists.txt
index df26a0f..c057288 100644
--- a/doc/kcontrol/CMakeLists.txt
+++ b/doc/kcontrol/CMakeLists.txt
@@ -6,16 +6,10 @@ ecm_optional_add_subdirectory(kcmaccess)
ecm_optional_add_subdirectory(kcmstyle)
ecm_optional_add_subdirectory(solid-actions)
ecm_optional_add_subdirectory(splashscreen)
-ecm_optional_add_subdirectory(bookmarks)
ecm_optional_add_subdirectory(icons)
ecm_optional_add_subdirectory(cookies)
ecm_optional_add_subdirectory(ebrowsing)
ecm_optional_add_subdirectory(useragent)
-ecm_optional_add_subdirectory(khtml-general)
-ecm_optional_add_subdirectory(khtml-plugins)
-ecm_optional_add_subdirectory(khtml-java-js)
-ecm_optional_add_subdirectory(khtml-behavior)
-ecm_optional_add_subdirectory(khtml-adblock)
ecm_optional_add_subdirectory(emoticons)
ecm_optional_add_subdirectory(baloo)
@@ -30,20 +24,16 @@ ecm_optional_add_subdirectory(mouse)
ecm_optional_add_subdirectory(paths)
ecm_optional_add_subdirectory(kcmsmserver)
ecm_optional_add_subdirectory(cache)
-ecm_optional_add_subdirectory(filemanager)
ecm_optional_add_subdirectory(filetypes)
-ecm_optional_add_subdirectory(kcmcss)
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(performance)
ecm_optional_add_subdirectory(proxy)
ecm_optional_add_subdirectory(spellchecking)
ecm_optional_add_subdirectory(componentchooser)
ecm_optional_add_subdirectory(kded)
-ecm_optional_add_subdirectory(history)
ecm_optional_add_subdirectory(solid-device-automounter)
ecm_optional_add_subdirectory(phonon)
diff --git a/doc/kcontrol/bookmarks/CMakeLists.txt
b/doc/kcontrol/bookmarks/CMakeLists.txt
deleted file mode 100644
index 5fba3a1..000
--- a/doc/kcontrol/bookmarks/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-### install files ###
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION
${HTML_INSTALL_DIR}/en SUBDIR kcontrol/bookmarks)
diff --git a/doc/kcontrol/bookmarks/index.docbook
b/doc/kcontrol/bookmarks/index.docbook
deleted file mode 100644
index 173222c..000
--- a/doc/kcontrol/bookmarks/index.docbook
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-]>
-
-
-
-
-Bookmarks
-
-
-XavierVello
-xavier.ve...@gmail.com
-
-
-
-
-2010-09-24
-0.2 ( 4.5)
-
-
-KDE
-KControl
-bookmarks
-KIO
-
-
-
-Bookmarks home page
-This module lets you configure the bookmarks home page.
-To view the bookmarks home page enter bookmarks:/
in
-the location bar.
-The settings in this module are also accessible by entering
-bookmarks:/config in the location bar.
-
-General settings
-
-
-Number of columns to show
-
-Folders are automatically distributed in several columns. The optimal
number of columns depends on the width of the konqueror window and the number
of bookmarks you have.
-
-
-
-
-Show folder backgrounds
-
-Disable it on slow system to disable background images.
-
-
-
-
-
-
-Bookmarks
-
-
-Show bookmarks without folder
-
-If this option is unchecked, bookmarks at the root of the hierarchy (not
in a folder) are not displayed. If checked, they are gathered in a "root"
folder.
-
-
-
-
-Flatten bookmarks tree
-
-Sub-folders are shown within their parent by default. If you activate
this option, sub-folders are displayed on their
Re: Review Request 128907: Remove Konqueror kcm docbooks from plasma-desktop repo
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128907/ --- (Updated Nov. 8, 2016, 4:16 p.m.) Status -- This change has been marked as submitted. Review request for Documentation and Plasma. Changes --- Submitted with commit daef6a7178982be93025a25d7f97071c35242547 by Burkhard Lück to branch master. Repository: plasma-desktop Description --- Code for these kcms is in kde-baseapps, therefore the docbooks should be deleted here. The docbooks are untouched in plasma-desktop, so it is better to move them with history from kde-runtime master to kde-baseapps see kde-baseapps Diffs - doc/kcontrol/bookmarks/CMakeLists.txt 5fba3a1 doc/kcontrol/bookmarks/index.docbook 173222c doc/kcontrol/filemanager/CMakeLists.txt dfd6879 doc/kcontrol/filemanager/index.docbook 2ac80b6 doc/kcontrol/history/CMakeLists.txt 6b269dc doc/kcontrol/history/index.docbook 27f805c doc/kcontrol/kcmcss/CMakeLists.txt 6f1f7e6 doc/kcontrol/kcmcss/index.docbook c63e83c doc/kcontrol/khtml-adblock/CMakeLists.txt 651f86d doc/kcontrol/khtml-adblock/index.docbook 1868626 doc/kcontrol/khtml-behavior/CMakeLists.txt 6f26166 doc/kcontrol/khtml-behavior/index.docbook ca39472 doc/kcontrol/khtml-general/CMakeLists.txt ef6dce6 doc/kcontrol/khtml-general/index.docbook 1b9c80e doc/kcontrol/khtml-java-js/CMakeLists.txt fabc610 doc/kcontrol/khtml-java-js/index.docbook d707fcb doc/kcontrol/khtml-plugins/CMakeLists.txt b041b5e doc/kcontrol/khtml-plugins/index.docbook faa4004 doc/kcontrol/performance/CMakeLists.txt 803a3ce doc/kcontrol/performance/index.docbook 5ac5055 Diff: https://git.reviewboard.kde.org/r/128907/diff/ Testing --- builds Thanks, Burkhard Lück
Re: Review Request 128907: Remove Konqueror kcm docbooks from plasma-desktop repo
> On Sept. 14, 2016, 2:55 nachm., Aleix Pol Gonzalez wrote: > > will you do the move from kde-runtime -> kdebase-apps? > > Luigi Toscano wrote: > First we may want to split kde-baseapps (see the email on > kde-core-devel), but apart from that, yes. > > Burkhard Lück wrote: > ALeix: > > will you do the move from kde-runtime -> kdebase-apps? > > I'll do that when kde-baseapps are splitted > > Luigi: > > First we may want to split kde-baseapps (see the email on > kde-core-devel), but apart from that, yes. > > we should remove the docbooks immediately, it is completely wrong to ship > them with Plasma and the konqueror kcm docbooks will be moved from > kde-runtime master > btw there are some more docbooks which should be removed from > plasma-desktop: > doc/kcontrol/filetypes/index.docbook:7: > doc/kcontrol/cache/index.docbook:7: > doc/kcontrol/cookies/index.docbook:7: > doc/kcontrol/proxy/index.docbook:7: > doc/kcontrol/webshortcuts/index.docbook:7: > doc/kcontrol/smb/index.docbook:7: > doc/kcontrol/netpref/index.docbook:7: > doc/kcontrol/useragent/index.docbook:7: These kcm docbooks are now imported with history from kde-runtime master into the new splitted konqueror repo with https://cgit.kde.org/konqueror.git/commit/?id=9bdf056cd7f0479cbf8400bc7e946d0a8f33ee6e and will be released in Applications 16.12. Therefore these kcm docbooks should be deleted from plasma-desktop immediately - Burkhard --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128907/#review99166 --- On Sept. 14, 2016, 2:02 nachm., Burkhard Lück wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/128907/ > --- > > (Updated Sept. 14, 2016, 2:02 nachm.) > > > Review request for Documentation and Plasma. > > > Repository: plasma-desktop > > > Description > --- > > Code for these kcms is in kde-baseapps, therefore the docbooks should be > deleted here. > The docbooks are untouched in plasma-desktop, so it is better to move them > with history from kde-runtime master to kde-baseapps see kde-baseapps > > > Diffs > - > > doc/kcontrol/bookmarks/CMakeLists.txt 5fba3a1 > doc/kcontrol/bookmarks/index.docbook 173222c > doc/kcontrol/filemanager/CMakeLists.txt dfd6879 > doc/kcontrol/filemanager/index.docbook 2ac80b6 > doc/kcontrol/history/CMakeLists.txt 6b269dc > doc/kcontrol/history/index.docbook 27f805c > doc/kcontrol/kcmcss/CMakeLists.txt 6f1f7e6 > doc/kcontrol/kcmcss/index.docbook c63e83c > doc/kcontrol/khtml-adblock/CMakeLists.txt 651f86d > doc/kcontrol/khtml-adblock/index.docbook 1868626 > doc/kcontrol/khtml-behavior/CMakeLists.txt 6f26166 > doc/kcontrol/khtml-behavior/index.docbook ca39472 > doc/kcontrol/khtml-general/CMakeLists.txt ef6dce6 > doc/kcontrol/khtml-general/index.docbook 1b9c80e > doc/kcontrol/khtml-java-js/CMakeLists.txt fabc610 > doc/kcontrol/khtml-java-js/index.docbook d707fcb > doc/kcontrol/khtml-plugins/CMakeLists.txt b041b5e > doc/kcontrol/khtml-plugins/index.docbook faa4004 > doc/kcontrol/performance/CMakeLists.txt 803a3ce > doc/kcontrol/performance/index.docbook 5ac5055 > > Diff: https://git.reviewboard.kde.org/r/128907/diff/ > > > Testing > --- > > builds > > > Thanks, > > Burkhard Lück > >
[Differential] [Request, 184 lines] D3310: update imported kcm docbooks to kf5
lueck created this revision. lueck added reviewers: dfaure, Documentation. lueck set the repository for this revision to R226 Konqueror. REVISION SUMMARY 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? TEST PLAN Builds and installs REPOSITORY R226 Konqueror REVISION DETAIL https://phabricator.kde.org/D3310 AFFECTED FILES CMakeLists.txt doc/CMakeLists.txt doc/kcontrol5/bookmarks/CMakeLists.txt doc/kcontrol5/bookmarks/index.docbook doc/kcontrol5/filemanager/CMakeLists.txt doc/kcontrol5/filemanager/index.docbook doc/kcontrol5/history/CMakeLists.txt doc/kcontrol5/history/index.docbook doc/kcontrol5/kcmcss/CMakeLists.txt doc/kcontrol5/kcmcss/index.docbook doc/kcontrol5/khtml-adblock/CMakeLists.txt doc/kcontrol5/khtml-adblock/index.docbook doc/kcontrol5/khtml-behavior/CMakeLists.txt doc/kcontrol5/khtml-behavior/index.docbook doc/kcontrol5/khtml-general/CMakeLists.txt doc/kcontrol5/khtml-general/index.docbook doc/kcontrol5/khtml-java-js/CMakeLists.txt doc/kcontrol5/khtml-java-js/index.docbook doc/kcontrol5/performance/CMakeLists.txt doc/kcontrol5/performance/index.docbook settings/bookmarks/bookmarks.desktop settings/konq/filebehavior.desktop settings/konqhtml/khtml_behavior.desktop settings/konqhtml/khtml_filter.desktop settings/konqhtml/khtml_general.desktop settings/konqhtml/khtml_java_js.desktop sidebar/history_module/kcmhistory.desktop EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
[konqueror] doc: update Konqueror docbook in the new repo
Git commit 15e435fe952b6221e52321a4af5ed70f008c82b1 by Burkhard Lück. Committed on 08/11/2016 at 12:48. Pushed by lueck into branch 'master'. update Konqueror docbook in the new repo remove sidebar remove profiles remove bookmarkseditor, this was moved into its own docbook WebKit -> WebEngine Differential Revision: https://phabricator.kde.org/D3304 M +18 -134 doc/index.docbook http://commits.kde.org/konqueror/15e435fe952b6221e52321a4af5ed70f008c82b1 diff --git a/doc/index.docbook b/doc/index.docbook index 385c6f9..05bed1f 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -29,7 +29,7 @@ -2016-08-12 +2016-11-05 Applications 16.12 is 's advanced File Manager, Web Browser and @@ -97,8 +97,6 @@ which anyone can configure to suit their own needs, from changing the overall style and the sizes of text and icons to selecting which items appear in the Menubar, changing the number and positions of the toolbars and even defining new shortcut key combinations. -Different configuration profiles can be -saved for easy recall as needed. @@ -212,9 +210,7 @@ Toolbar to go to it. The black icon at the right hand end of the The Bookmark Toolbar is the area under the Location Toolbar in the previous screenshot. You can add frequently used bookmarks here; see the Organizing -Your -Bookmarks section of this document. +linkend="bookmarks">Organizing Your Bookmarks section of this document. The Window is the main area of and can show you the contents of a directory, web page, document or image. Using @@ -1946,76 +1942,18 @@ the Add Bookmark item in that folder. If you enter bookmarks: in the location bar the bookmarks home page with an overview of all bookmarks and folders is shown. - -The Bookmark Editor - -The BookmarksEdit -Bookmarks option opens the Bookmark -Editor. -This shows a tree view of your bookmarks and bookmark subfolders. -As is usual for tree views in , subfolders are shown with a small - arrow at the left of the folder name; -left clicking on it will expand the view to -show the contents of that subfolder and the arrow will -change to v; left clicking on the -v arrow will collapse the subfolder view. - -To select an item in the list you can left -click on it, or you can navigate through the list by using the Up -and Down keys to move around, Right to expand a subfolder and -Left to collapse it. - -You can move an item to a different place in the list by using the -normal Drag and Drop or Cut and -Paste methods. The order in which the items appear in -the Bookmark Editor is the order they will appear in the -Bookmarks drop down list. The Folder -Insert Separator option can -be used to insert separating lines into the list wherever you wish. - -A new subfolder can be created at the selected point in the list by -using the New Folder... option in the -Folder menu or from the drop down menu you get when you -right click on an item in the main part of the -window, or with N +If you want to edit your bookmarks use the Bookmark Editor -To change the name of a bookmark or folder select it then press -F2 or choose the Rename item from -the Edit menu or the pop up menu that appears when you -right click on the item. Similarly, you can edit -the by pressing F3 or choosing the -Change Location menu item. - -The Bookmark Editor lets you import bookmarks from -a range of other browsers into 's bookmark list, putting them into - a new folder or replacing all current bookmarks. To do this select -Import from the File menu. The -FileExport - option can be used to export 's bookmarks to a - or Mozilla browser. - -To select which bookmark subfolder is used to hold the Bookmark -Toolbar items select the subfolder then choose Set as Toolbar -Folder from the Folder menu. - -If you are tidying up your bookmarks and have forgotten what a -particular web page is, you can easily open it from within the -Bookmark Editor by right clicking -on the item and selecting Open in Konqueror from -the pop up menu. If you just want to check that the is still valid -select Check Status instead. - -All your changes are automatically saved if you close -the Bookmark Editor. - - - - Web Page Translation @@ -2410,7 +2339,7 @@ to validate your and . -HTML Settings (KHTML/WebKit view) +HTML Settings (KHTML view) Select ToolsHTML Settings to enable or disable a number of HTML settings without going through the Settings dialog. @@ -3166,7 +3095,7 @@ attachment. File -Save Background Image As... (Browser mode) +Save Background Image As... (Browser mode - KHTML view) Only applies if you are viewing a web page with a background image. Opens the Save As dialog box to let you save the background @@ -3477,7 +3406,7 @@ in the text or page. View Mode In browser mode this submenu holds items to select embedded -views like KHTML, WebKit, Embedded Advanced +views like KHTML, WebEngine, Embedded Advanc
[Differential] [Closed] D3304: update Konqueror docbook in the new repo
This revision was automatically updated to reflect the committed changes. Closed by commit R226:15e435fe952b: update Konqueror docbook in the new repo (authored by lueck). REPOSITORY R226 Konqueror CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3304?vs=7991=8012 REVISION DETAIL https://phabricator.kde.org/D3304 AFFECTED FILES doc/index.docbook EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, #documentation, dfaure
[konqueror] doc/kcontrol/khtml-adblock: update adblock kcm to 4.8
Git commit ef20d91dd0544981f0172f7207f3359e14249630 by Burkhard Lück. Committed on 22/11/2011 at 21:11. Pushed by lueck into branch 'master'. update adblock kcm to 4.8 M +38 -21 doc/kcontrol/khtml-adblock/index.docbook http://commits.kde.org/konqueror/ef20d91dd0544981f0172f7207f3359e14249630 diff --git a/doc/kcontrol/khtml-adblock/index.docbook b/doc/kcontrol/khtml-adblock/index.docbook index 1c01f93..5130717 100644 --- a/doc/kcontrol/khtml-adblock/index.docbook +++ b/doc/kcontrol/khtml-adblock/index.docbook @@ -5,8 +5,8 @@ ]> - - + + AdBlocK Filters @@ -14,22 +14,10 @@ -2009-11-24 - 4.4 - - -KDE -Systemsettings -konqueror -browsing -filter - - +2011-11-22 + 4.8 - -AdBlocK - AdBlocK can be configured to replace or remove images or frames from web pages that match a series of filters. @@ -40,7 +28,11 @@ blocked images are completely removed from the page and the space they occupied is reclaimed. If the option is disabled then a placeholder image is used in place of filtered images. -URL Expressions to Filter is a list of + + +Manual Filter + +The main part of this tab is a list of 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. @@ -57,13 +49,38 @@ by enclosing the filter with forward slashes (e.g. //(ads|dclk)\./). filter. Import and Export will -save or read the current filter list to a -plain text file. Lines prefixed with an exclamation mark (!) are treated -as comments and can be used to clarify or label a set of filters. +save or read the current filter list to a plain text file. The file begins with a +header line [AdBlock], then all of the filters follow each +on a separate line. Lines prefixed with an exclamation mark (!) +and the header line are treated as comments and can be used +to clarify or label a set of filters. Highlight an entry from the list to change it in the edit box or remove this item. Enter a new filter string here and add it to the list using the Insert button. - + + + + +Automatic Filter + + +This tab shows a list of names and 's with predefined AdBlock filter entries. +To enable an entry tick the checkbox beside the filter name and adjust the . +Automatic update interval (default 7 days). + + + + + + +If AdBlock filters are enabled, an icon at the right side of status bar is shown. +Use a click on this icon to open the context menu with actions to show all blockable +elements on a web page, open this module and disable blocking for a site +or page temporarily. + +A click with the shows the dialog with all blockable elements on the opened web page +as well. From this dialog you can add new filters directly without opening this +module.
[konqueror] doc/kcontrol/filemanager: fix wrong guilabel reported by Antoni Bella Pérez
Git commit 0cfaa1ab842ac08d35fef47a49ec1b742d2a6ceb by Burkhard Lück. Committed on 13/10/2011 at 19:34. Pushed by lueck into branch 'master'. fix wrong guilabel reported by Antoni Bella Pérez CCMAIL:antonibel...@orange.es M +1-1doc/kcontrol/filemanager/index.docbook http://commits.kde.org/konqueror/0cfaa1ab842ac08d35fef47a49ec1b742d2a6ceb diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook index 70928c1..7f8650c 100644 --- a/doc/kcontrol/filemanager/index.docbook +++ b/doc/kcontrol/filemanager/index.docbook @@ -42,7 +42,7 @@ window. -Show 'Delete' context menu entries which +Show 'Delete' menu entries which bypass the trashcan Check this if you want Delete menu commands to be
[konqueror] doc/kcontrol: doc update for konqui's configuration dialogs, all 21 pages are up to date now :)
Git commit f70ee062b0a74be683538bd29aefb7b97dcee070 by Burkhard Lück. Committed on 18/12/2009 at 15:54. Pushed by lueck into branch 'master'. doc update for konqui's configuration dialogs, all 21 pages are up to date now :) svn path=/trunk/KDE/kdebase/runtime/; revision=1063455 M +17 -253 doc/kcontrol/filemanager/index.docbook D +---doc/kcontrol/filemanager/kfileman1.png D +---doc/kcontrol/filemanager/kfileman2.png A +2-0doc/kcontrol/khtml-general/CMakeLists.txt A +137 -0doc/kcontrol/khtml-general/index.docbook http://commits.kde.org/konqueror/f70ee062b0a74be683538bd29aefb7b97dcee070 diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook index be620a8..70928c1 100644 --- a/doc/kcontrol/filemanager/index.docbook +++ b/doc/kcontrol/filemanager/index.docbook @@ -7,137 +7,33 @@ - +File Management -2002-10-16 -3.1 +2009-12-18 + 4.4 KDE -KControl +Systemsettings file manager - -File Manager -In this module, you can configure various aspects of +In these modules, you can configure various aspects of 's file manager functionality. 's web browser functionality has its own configuration +url="help:/kcontrol/khtml-behavior/index.html">own configuration modules. - -Use - - The configuration options for the file manager are -organized under tabs as follows: - - - -Appearance -This tab contains options for customizing the appearance of - windows, such as the default font -text color. - - - -Behavior -This tab contains a couple of -global options. - - - -Previews - -On this tab, you can customize when should show -previews. - - - - - -Appearance - -The following settings determine how text and colors are displayed in - File Manager mode windows. - - - -Standard font: - -This is the font used to display text such as file names in - windows. - - - - -Font size: - - -Lets you control the size of text, while the Standard -Font setting determines the font face used. - - - - -Normal text color: - -Determines the standard text color. - - - - -Height for icon text: - -The maximum number of lines that can be used to draw icon text. Long lines are truncated at the end of the last line. - You can still see word-wrapped filenames by pausing the mouse pointer over the icon. - - - - -Width for icon text: - -The maximum width for the icon text when is in multi-column view mode. - - - - -Underline filenames: - -When Underline filenames is checked, - filenames will be underlined so that they look like links on a web - page. - - - - -Display file sizes in bytes: - -The final check box on this page determines how -displays file sizes, when you are in one of the file manager modes -that normally shows this information. If you check the -Display file sizes in bytes box then file sizes -are always shown in bytes. If you leave it unchecked then file sizes -are shown in bytes, kilobytes or megabytes, depending on their -size. - - - - - - -Behavior - Misc Options -Open folders in separate windows +Open folders in separate windows If this option is checked, a new window will be created when you open a folder, rather than simply showing that folder's contents in the @@ -146,152 +42,20 @@ window. -Show network operations in a single window +Show 'Delete' context menu entries which +bypass the trashcan -If unchecked, and you download a -file, a dialog box will appear that shows the status of the -download. - - - Download Dialog Box - - - Download Dialog Box - - Individual Download Dialog Box - - - - -If you start a new transfer, another dialog box will -appear. ( users will be familiar with -this behavior) - -If checked, all transfer status windows will be grouped -together under a single dialog box. - - Download Dialog Box - - - Download Dialog Box - - Collected Download Dialog Box - - - - -If you choose to use the Collected download dialog box, you can -delete transfers by clicking once on the transfer you want to cancel, -then clicking the Delete Button on the -left. - +Check this if you want Delete menu commands to be +displayed on the desktop and in the file manager's context menus. +You can always delete files by holding the key while calling +Move to Trash. - - -Show file tips - - Here you can control if, when moving the mouse over a file, you -want to see a small popup window with additional information about -that file. - - - - -Show previews in file tips - -Here you can control if the file tip should show a -thumbnail preview of the file. - - - - - -Home URL -This is the ( a -folder or a web page) where will jump to -when the Home button is pressed.The -default is the users home folder, indicated with a -~. - -You can set a path that is your Home URL by -typing into the text field, or using the browse -icon. The default is ~ which is a standard -shortcut for your $HOME folder. When you choose the -home icon on your panel, in a file
[konqueror] doc/kcontrol: doc backport from trunk
Git commit b21186b412f223300def29eb4459656cd3402966 by Burkhard Lück. Committed on 09/02/2010 at 17:28. Pushed by lueck into branch 'master'. doc backport from trunk svn path=/branches/KDE/4.4/kdebase/runtime/; revision=1087862 M +2-2doc/kcontrol/khtml-behavior/index.docbook M +1-2doc/kcontrol/khtml-general/index.docbook M +1-2doc/kcontrol/khtml-java-js/index.docbook http://commits.kde.org/konqueror/b21186b412f223300def29eb4459656cd3402966 diff --git a/doc/kcontrol/khtml-behavior/index.docbook b/doc/kcontrol/khtml-behavior/index.docbook index 0bfc1c6..a986c47 100644 --- a/doc/kcontrol/khtml-behavior/index.docbook +++ b/doc/kcontrol/khtml-behavior/index.docbook @@ -47,7 +47,7 @@ try to remember what you answer to form questions, and will try to fill in forms for you with the answers you previously used. You can configure the number of form items remembers -with the slider below labelled Maximum +with the spin box labelled Maximum completions Of course, anything fills in a form with, you @@ -78,7 +78,7 @@ to change your bookmark, and then automatically move you along to the new website. However, such features can be confusing, or annoying, when misused, and so you may wish to disable it. -Enable Access Key activation with Ctrl key: +Enable Access Key activation with key: Pressing the key when viewing web pages activates Access Keys. Unchecking this box will disable this accessibility feature. needs to be restarted for this change to take effect. diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook index 9532868..78bd7e5 100644 --- a/doc/kcontrol/khtml-general/index.docbook +++ b/doc/kcontrol/khtml-general/index.docbook @@ -119,8 +119,7 @@ effect. Confirm when closing windows with multiple tabs If you close a window in that has multiple tabs open, will ask you if you're sure that you meant to close -it. You can toggle on and off this behavior with the -Confirm when closing windows with multiple tabs +it. You can toggle on and off this behavior with this check box. diff --git a/doc/kcontrol/khtml-java-js/index.docbook b/doc/kcontrol/khtml-java-js/index.docbook index 446c7f5..505f2db 100644 --- a/doc/kcontrol/khtml-java-js/index.docbook +++ b/doc/kcontrol/khtml-java-js/index.docbook @@ -98,8 +98,7 @@ arguments. Despite the name, JavaScript is not related at all to . -The first part of this tab works the same as the page -settings. +The first part of this tab works the same as the settings. The checkbox Enable JavaScript globally allows you to turn JavaScript support on for all web sites by default. You
[konqueror] doc/kcontrol/bookmarks: update bookmarks documentation
Git commit 330031fc25765434f7481aa5b483223184bba65c by Burkhard Lück. Committed on 24/09/2010 at 09:38. Pushed by lueck into branch 'master'. update bookmarks documentation svn path=/trunk/KDE/kdebase/runtime/; revision=1179004 M +9-4doc/kcontrol/bookmarks/index.docbook http://commits.kde.org/konqueror/330031fc25765434f7481aa5b483223184bba65c diff --git a/doc/kcontrol/bookmarks/index.docbook b/doc/kcontrol/bookmarks/index.docbook index b063b15..143c18d 100644 --- a/doc/kcontrol/bookmarks/index.docbook +++ b/doc/kcontrol/bookmarks/index.docbook @@ -8,7 +8,7 @@ -Bookmarks home page +Bookmarks XavierVello @@ -17,8 +17,8 @@ -2008-08-31 -0.2 +2010-09-24 +0.2 ( 4.5) KDE @@ -28,7 +28,12 @@ -Configuration options +Bookmarks home page +This module lets you configure the bookmarks home page. +To view the bookmarks home page enter bookmarks:/ in +the location bar. +The settings in this module are also accessible by entering +bookmarks:/config in the location bar. General settings
[konqueror] doc/kcontrol/khtml-general: doc update to 4.8
Git commit 6e0a057a7f1671834d6e025c442ac3c9acf05f90 by Burkhard Lück. Committed on 22/11/2011 at 20:14. Pushed by lueck into branch 'master'. doc update to 4.8 M +13 -6doc/kcontrol/khtml-general/index.docbook http://commits.kde.org/konqueror/6e0a057a7f1671834d6e025c442ac3c9acf05f90 diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook index f033578..23bf553 100644 --- a/doc/kcontrol/khtml-general/index.docbook +++ b/doc/kcontrol/khtml-general/index.docbook @@ -14,8 +14,8 @@ -2009-12-18 - 4.4 +2011-11-22 + 4.8 KDE @@ -27,10 +27,7 @@ General Behavior - + On this page you find settings for home and start page and the behavior of tabbed browsing both for 's file manager and browser mode. @@ -57,6 +54,16 @@ button in the toolbar is replaced by a Home Folder button 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 , 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
[konqueror] doc/kcontrol: add missing titles for runtime kcm docs
Git commit 6995239439bb29bcb867243fe36579a76a5815b4 by Burkhard Lück. Committed on 31/05/2010 at 16:08. Pushed by lueck into branch 'master'. add missing titles for runtime kcm docs svn path=/trunk/KDE/kdebase/runtime/; revision=1132866 M +1-1doc/kcontrol/kcmcss/index.docbook M +1-1doc/kcontrol/khtml-adblock/index.docbook M +1-1doc/kcontrol/khtml-behavior/index.docbook M +1-1doc/kcontrol/khtml-java-js/index.docbook M +2-2doc/kcontrol/performance/index.docbook http://commits.kde.org/konqueror/6995239439bb29bcb867243fe36579a76a5815b4 diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook index fea539e..ee9af18 100644 --- a/doc/kcontrol/kcmcss/index.docbook +++ b/doc/kcontrol/kcmcss/index.docbook @@ -7,7 +7,7 @@ - +Appearance diff --git a/doc/kcontrol/khtml-adblock/index.docbook b/doc/kcontrol/khtml-adblock/index.docbook index 1a10c02..1c01f93 100644 --- a/doc/kcontrol/khtml-adblock/index.docbook +++ b/doc/kcontrol/khtml-adblock/index.docbook @@ -8,7 +8,7 @@ - +AdBlocK Filters diff --git a/doc/kcontrol/khtml-behavior/index.docbook b/doc/kcontrol/khtml-behavior/index.docbook index a986c47..f9a1cf5 100644 --- a/doc/kcontrol/khtml-behavior/index.docbook +++ b/doc/kcontrol/khtml-behavior/index.docbook @@ -8,7 +8,7 @@ - +Web Behavior diff --git a/doc/kcontrol/khtml-java-js/index.docbook b/doc/kcontrol/khtml-java-js/index.docbook index 505f2db..6ec6552 100644 --- a/doc/kcontrol/khtml-java-js/index.docbook +++ b/doc/kcontrol/khtml-java-js/index.docbook @@ -8,7 +8,7 @@ - +Java and JavaScript diff --git a/doc/kcontrol/performance/index.docbook b/doc/kcontrol/performance/index.docbook index 4e7bb72..411c4e7 100644 --- a/doc/kcontrol/performance/index.docbook +++ b/doc/kcontrol/performance/index.docbook @@ -7,7 +7,7 @@ - +Performance @@ -88,4 +88,4 @@ This means that the next time a user wants loaded, it is nearly inst --> - \ No newline at end of file +
[konqueror] doc/kcontrol/khtml-general: get rid of useless keywords and sect1 markup
Git commit f44408db743752bfa275a4972f80115adf65148e by Burkhard Lück. Committed on 22/11/2011 at 21:16. Pushed by lueck into branch 'master'. get rid of useless keywords and sect1 markup M +1-13 doc/kcontrol/khtml-general/index.docbook http://commits.kde.org/konqueror/f44408db743752bfa275a4972f80115adf65148e diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook index 23bf553..70c14f0 100644 --- a/doc/kcontrol/khtml-general/index.docbook +++ b/doc/kcontrol/khtml-general/index.docbook @@ -5,7 +5,7 @@ ]> - + General Behavior @@ -17,17 +17,7 @@ 2011-11-22 4.8 - -KDE -Systemsettings -Konqueror -Behavior - - - -General Behavior - On this page you find settings for home and start page and the behavior of tabbed browsing both for 's file manager and browser mode. @@ -142,6 +132,4 @@ you close the current active tab instead of the one right to the current tab. - -
[konqueror] doc/kcontrol/khtml-general: add missing title
Git commit 4e702060dce8e34fb1600e7b3428695b15ca2543 by Burkhard Lück. Committed on 14/07/2011 at 21:41. Pushed by lueck into branch 'master'. add missing title M +1-0doc/kcontrol/khtml-general/index.docbook http://commits.kde.org/konqueror/4e702060dce8e34fb1600e7b3428695b15ca2543 diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook index 12fdd29..f033578 100644 --- a/doc/kcontrol/khtml-general/index.docbook +++ b/doc/kcontrol/khtml-general/index.docbook @@ -6,6 +6,7 @@ ]> +General Behavior
[konqueror] doc/kcontrol/khtml-general: fix errors found while translatingkdebase/apps/doc/konqueror/
Git commit dff39211e8b194af2a2ba361a104187c1b60925b by Burkhard Lück. Committed on 05/11/2010 at 22:07. Pushed by lueck into branch 'master'. fix errors found while translatingkdebase/apps/doc/konqueror/ svn path=/trunk/KDE/kdebase/runtime/; revision=1193408 M +4-1doc/kcontrol/khtml-general/index.docbook http://commits.kde.org/konqueror/dff39211e8b194af2a2ba361a104187c1b60925b diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook index 78bd7e5..12fdd29 100644 --- a/doc/kcontrol/khtml-general/index.docbook +++ b/doc/kcontrol/khtml-general/index.docbook @@ -26,7 +26,10 @@ General Behavior - + On this page you find settings for home and start page and the behavior of tabbed browsing both for 's file manager and browser mode.
[konqueror] doc/kcontrol/khtml-behavior: update to 4.10
Git commit 4dea00ea8754d7a9fd3e6446b592962a7b82e1b4 by Burkhard Lück. Committed on 11/11/2012 at 21:23. Pushed by lueck into branch 'master'. update to 4.10 M +9-6doc/kcontrol/khtml-behavior/index.docbook http://commits.kde.org/konqueror/4dea00ea8754d7a9fd3e6446b592962a7b82e1b4 diff --git a/doc/kcontrol/khtml-behavior/index.docbook b/doc/kcontrol/khtml-behavior/index.docbook index bd9eb52..74783d6 100644 --- a/doc/kcontrol/khtml-behavior/index.docbook +++ b/doc/kcontrol/khtml-behavior/index.docbook @@ -14,8 +14,8 @@ -2009-12-01 - 4.4 +2011-11-11 + 4.10 KDE @@ -83,11 +83,14 @@ Pressing the key when viewing web pages activates Access Keys. Unchecking this box will disable this accessibility feature. needs to be restarted for this change to take effect. - +Send the DNT header to tell web sites you do not want +to be tracked. Check this box if you want to inform a web site +that you do not want to your web browsing habits tracked. + +Offer to save website passwords. +Uncheck this box from beeing prompted to save website passwords +
[Differential] [Closed] D3275: Import konqueror kcm docbooks from kde-runtime master
This revision was automatically updated to reflect the committed changes. Closed by commit R226:9bdf056cd7f0: mport konqueror kcm docbooks from kde-runtime master (authored by lueck). CHANGED PRIOR TO COMMIT https://phabricator.kde.org/D3275?vs=7931=8011#toc REPOSITORY R226 Konqueror CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3275?vs=7931=8011 REVISION DETAIL https://phabricator.kde.org/D3275 AFFECTED FILES doc/kcontrol/bookmarks/CMakeLists.txt doc/kcontrol/bookmarks/index.docbook doc/kcontrol/filemanager/CMakeLists.txt doc/kcontrol/filemanager/index.docbook doc/kcontrol/history/CMakeLists.txt doc/kcontrol/history/index.docbook doc/kcontrol/kcmcss/CMakeLists.txt doc/kcontrol/kcmcss/index.docbook doc/kcontrol/khtml-adblock/CMakeLists.txt doc/kcontrol/khtml-adblock/index.docbook doc/kcontrol/khtml-behavior/CMakeLists.txt doc/kcontrol/khtml-behavior/index.docbook doc/kcontrol/khtml-general/CMakeLists.txt doc/kcontrol/khtml-general/index.docbook doc/kcontrol/khtml-java-js/CMakeLists.txt doc/kcontrol/khtml-java-js/index.docbook doc/kcontrol/performance/CMakeLists.txt doc/kcontrol/performance/index.docbook EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, #documentation, dfaure
[konqueror] doc/kcontrol: add some FIXME's and a missing whitespace
Git commit 2a212633f9e30273bc8d85da707550401b205dea by Burkhard Lück. Committed on 04/05/2012 at 13:00. Pushed by lueck into branch 'master'. add some FIXME's and a missing whitespace M +4-0doc/kcontrol/khtml-adblock/index.docbook M +6-2doc/kcontrol/khtml-java-js/index.docbook http://commits.kde.org/konqueror/2a212633f9e30273bc8d85da707550401b205dea diff --git a/doc/kcontrol/khtml-adblock/index.docbook b/doc/kcontrol/khtml-adblock/index.docbook index 41d5cf6..e153d5f 100644 --- a/doc/kcontrol/khtml-adblock/index.docbook +++ b/doc/kcontrol/khtml-adblock/index.docbook @@ -68,6 +68,10 @@ Insert button. This tab shows a list of names and 's with predefined AdBlock filter entries. To enable an entry tick the checkbox beside the filter name and adjust the Automatic update interval (default 7 days). + diff --git a/doc/kcontrol/khtml-java-js/index.docbook b/doc/kcontrol/khtml-java-js/index.docbook index 6ec6552..d7f6ad9 100644 --- a/doc/kcontrol/khtml-java-js/index.docbook +++ b/doc/kcontrol/khtml-java-js/index.docbook @@ -114,7 +114,11 @@ on the left of the page. that host. Clicking the Delete button removes the policy for the selected host; after deletion, the global settings will then apply to that host. - + The final set of options in the section Global JavaScript Policies determine what happens when a page uses JavaScript for specific actions. @@ -123,7 +127,7 @@ when a page uses JavaScript for specific actions. to manipulate your windows by moving, resizing or changing focus. You can also disable JavaScript from changing the status bar text, so that for instance, you can always see where links will take you when -clicked.The choices for these options are Allow and +clicked. The choices for these options are Allow and Ignore. For opening a new window, there is even more control. You can
[konqueror] doc/kcontrol: doc fixes found while translating
Git commit 7514b53ea3981b26d934fd01993430488dad9d7c by Burkhard Lück. Committed on 09/01/2010 at 19:30. Pushed by lueck into branch 'master'. doc fixes found while translating svn path=/trunk/KDE/kdebase/runtime/; revision=1072268 M +1-2doc/kcontrol/khtml-general/index.docbook M +1-2doc/kcontrol/khtml-java-js/index.docbook http://commits.kde.org/konqueror/7514b53ea3981b26d934fd01993430488dad9d7c diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook index 9532868..78bd7e5 100644 --- a/doc/kcontrol/khtml-general/index.docbook +++ b/doc/kcontrol/khtml-general/index.docbook @@ -119,8 +119,7 @@ effect. Confirm when closing windows with multiple tabs If you close a window in that has multiple tabs open, will ask you if you're sure that you meant to close -it. You can toggle on and off this behavior with the -Confirm when closing windows with multiple tabs +it. You can toggle on and off this behavior with this check box. diff --git a/doc/kcontrol/khtml-java-js/index.docbook b/doc/kcontrol/khtml-java-js/index.docbook index 446c7f5..505f2db 100644 --- a/doc/kcontrol/khtml-java-js/index.docbook +++ b/doc/kcontrol/khtml-java-js/index.docbook @@ -98,8 +98,7 @@ arguments. Despite the name, JavaScript is not related at all to . -The first part of this tab works the same as the page -settings. +The first part of this tab works the same as the settings. The checkbox Enable JavaScript globally allows you to turn JavaScript support on for all web sites by default. You
[konqueror] doc/kcontrol/khtml-behavior: fix errors found while translating
Git commit 9c796b109723c940940b2db6d90a96b092c57e07 by Burkhard Lück. Committed on 20/01/2010 at 21:00. Pushed by lueck into branch 'master'. fix errors found while translating svn path=/trunk/KDE/kdebase/runtime/; revision=1077764 M +2-2doc/kcontrol/khtml-behavior/index.docbook http://commits.kde.org/konqueror/9c796b109723c940940b2db6d90a96b092c57e07 diff --git a/doc/kcontrol/khtml-behavior/index.docbook b/doc/kcontrol/khtml-behavior/index.docbook index 0bfc1c6..a986c47 100644 --- a/doc/kcontrol/khtml-behavior/index.docbook +++ b/doc/kcontrol/khtml-behavior/index.docbook @@ -47,7 +47,7 @@ try to remember what you answer to form questions, and will try to fill in forms for you with the answers you previously used. You can configure the number of form items remembers -with the slider below labelled Maximum +with the spin box labelled Maximum completions Of course, anything fills in a form with, you @@ -78,7 +78,7 @@ to change your bookmark, and then automatically move you along to the new website. However, such features can be confusing, or annoying, when misused, and so you may wish to disable it. -Enable Access Key activation with Ctrl key: +Enable Access Key activation with key: Pressing the key when viewing web pages activates Access Keys. Unchecking this box will disable this accessibility feature. needs to be restarted for this change to take effect.
[konqueror] doc/kcontrol/history: add history doc
Git commit 94e96ec5ea9c55794a8908548c0074f603d7914c by Burkhard Lück.
Committed on 24/11/2009 at 16:37.
Pushed by lueck into branch 'master'.
add history doc
svn path=/trunk/KDE/kdebase/runtime/; revision=1053708
A +2-0doc/kcontrol/history/CMakeLists.txt
A +62 -0doc/kcontrol/history/index.docbook
http://commits.kde.org/konqueror/94e96ec5ea9c55794a8908548c0074f603d7914c
diff --git a/doc/kcontrol/history/CMakeLists.txt
b/doc/kcontrol/history/CMakeLists.txt
new file mode 100644
index 000..fcd8d59
--- /dev/null
+++ b/doc/kcontrol/history/CMakeLists.txt
@@ -0,0 +1,2 @@
+### install files ###
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
SUBDIR kcontrol/history)
diff --git a/doc/kcontrol/history/index.docbook
b/doc/kcontrol/history/index.docbook
new file mode 100644
index 000..6a38f4c
--- /dev/null
+++ b/doc/kcontrol/history/index.docbook
@@ -0,0 +1,62 @@
+
+
+
+]>
+
+History Sidebar
+
+
+
+
+
+
+2009-11-24
+ 4.4
+
+
+KDE
+Systemsettings
+history
+
+
+
+
+This dialog allows you to configure the history sidebar.
+
+
+
+Limits
+
+The options in this section can be used to set the maximum size of your
history and set a time after which
+items are automatically removed.
+
+
+
+
+Custom Font
+
+Here you can also set different fonts for new and
+old s by selecting the Choose Font button.
+
+
+
+
+Details
+
+The Detailed tooltips check box controls how much
+information is displayed when you hover the mouse pointer over an item in the
+history page.
+If checked the number of times visited and the dates of the first and
last
+visits are shown, in addition to the URL.
+
+
+
+
+Selecting Clear History will
+clear out the entire history.
+
+
[konqueror] doc/kcontrol/khtml-behavior: title of kcm doc changed to Web Browsing
Git commit c1a6156efcfdcf0762b285125a6329676b40e70e by Burkhard Lück. Committed on 05/07/2011 at 19:11. Pushed by lueck into branch 'master'. title of kcm doc changed to Web Browsing M +7-2doc/kcontrol/khtml-behavior/index.docbook http://commits.kde.org/konqueror/c1a6156efcfdcf0762b285125a6329676b40e70e diff --git a/doc/kcontrol/khtml-behavior/index.docbook b/doc/kcontrol/khtml-behavior/index.docbook index f9a1cf5..4912ae7 100644 --- a/doc/kcontrol/khtml-behavior/index.docbook +++ b/doc/kcontrol/khtml-behavior/index.docbook @@ -8,7 +8,7 @@ -Web Behavior +Web Browsing @@ -26,7 +26,7 @@ -Web Behavior +Web Browsing The Browser module of allows you to select various options for the behavior of , the @@ -83,6 +83,11 @@ Pressing the key when viewing web pages activates Access Keys. Unchecking this box will disable this accessibility feature. needs to be restarted for this change to take effect. + +
[konqueror] doc/kcontrol: update konqui browser kcm docs, cmake files missing, X-DocPath's still wrong, but the docbooks have to go in now to avoid trouble with our translators
Git commit e375da5d56aff4a38bd7387d69a2a1c68c1a2ea9 by Burkhard Lück. Committed on 01/12/2009 at 15:34. Pushed by lueck into branch 'master'. update konqui browser kcm docs, cmake files missing, X-DocPath's still wrong, but the docbooks have to go in now to avoid trouble with our translators svn path=/trunk/KDE/kdebase/runtime/; revision=1057142 M +174 -64 doc/kcontrol/kcmcss/index.docbook A +69 -0doc/kcontrol/khtml-adblock/index.docbook A +88 -0doc/kcontrol/khtml-behavior/index.docbook A +142 -0doc/kcontrol/khtml-java-js/index.docbook http://commits.kde.org/konqueror/e375da5d56aff4a38bd7387d69a2a1c68c1a2ea9 diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook index f7d6d96..fea539e 100644 --- a/doc/kcontrol/kcmcss/index.docbook +++ b/doc/kcontrol/kcmcss/index.docbook @@ -13,23 +13,137 @@ -2003-10-12 -3.2 +2009-12-01 + 4.4 KDE CSS +Appearance +Font +CSS Stylesheets Accessibility - + +Appearance +This module consists of three tabs with configure options how to display web pages. + + +General + +The check box labeled Automatically load +images allows you to control whether images on web pages are +loaded by default. Unless you have a very slow connection, you will +probably want to leave this option selected, as there are many web pages +that are difficult to use without images. If you don't select the option +to automatically load images, you can still view the text on the page, +and then load the images if you need them. + +If Draw frame around not completely loaded images +is checked, will draw a frame as a placeholder +around images embedded in a web page that are not yet fully loaded. You +will probably want to check this box to enhance your browsing experience, +especially if have a slow network connection. + +Many web pages use animated gif images, and these can be very +annoying, and in some cases, quite a drain on your system resources. +The Animations option lets you choose when +animations are enabled. The default is enabled, but you can set this +to disabled, or to run the animation only once, even if the file +itself contains instructions that the animation should run more times, +or continuously. + +The next setting is Underline links:. You can +choose to underline links Enabled. If this option +is selected, any text on web pages that acts as a link will be shown in +an underlined font. While many web pages do use color to distinguish +text that acts as a link, underlining makes it very easy to spot +links. + +If you don't like underlined links, you can choose +Disabled, so that no links are underlined. Or you +can choose a middle ground, Only on Hover, so that links +are underlined when the mouse cursor is resting over them, and not +underlined the rest of the time. + +The site's CSS definitions can override this value. + +Smooth scrolling +determines whether should use smooth steps to scroll +pages, or whole steps: + +Always: Always use smooth steps +when scrolling. +Never: Never use smooth scrolling, scroll +with whole steps instead. +When Efficient: Only use smooth +scrolling on pages where it can be achieved with moderate usage of system +resources. + + + + + + +Fonts +Under this tab, you can select various options related to the use +of fonts. Although the shapes and sizes of fonts are often part of the +design of a web page, you can select some default settings for + to use. + +The first thing you can set here is the font size. There are two +settings which work together to allow you a comfortable browsing +experience. + +Firstly, you can set a Minimum font size. +This means, even if the font size is set specifically in the page you +are viewing, will ignore that instruction and never show +smaller fonts than you set here. + +Next you can set a Medium font size. This is +not only the default size of text, used when the page does not specify +sizes, but it is also used as the base size that relative font sizes are +calculated against. That is, the instruction +smaller, it means smaller than the size you set for this +option. + +For either option, you can select the exact font size in points by +using the up/down spin control (or just typing) next to the option +label. + +These options are independent of each other. Pages that do not +set a font size, or ask for the default, will display with the size +you set from Medium font size, while any pages +that ask for a size smaller than your Minimum font +size setting will instead show that size. The one does not +affect the other. + +The remaining options are for the fonts to be associated with +different types of markup used in pages. Note +that many web pages may override these settings. For any type of font +(Standard, Fixed, Serif, ) you can select a different font if you like. + +Below this, you can set a Font size adjustment for this +encoding. Sometimes the fonts you want to use for a +particular encoding or language are much
[konqueror] doc/kcontrol/performance: update performance doc
Git commit 81089aa9a9b6aa7e351ee9430956025979cf8edc by Burkhard Lück. Committed on 24/11/2009 at 15:58. Pushed by lueck into branch 'master'. update performance doc svn path=/trunk/KDE/kdebase/runtime/; revision=1053696 M +16 -27 doc/kcontrol/performance/index.docbook http://commits.kde.org/konqueror/81089aa9a9b6aa7e351ee9430956025979cf8edc diff --git a/doc/kcontrol/performance/index.docbook b/doc/kcontrol/performance/index.docbook index b0acf06..4e7bb72 100644 --- a/doc/kcontrol/performance/index.docbook +++ b/doc/kcontrol/performance/index.docbook @@ -13,13 +13,12 @@ -2005-03-04 -3.4.0 +2009-11-24 + 4.4 KDE -KControl -system performance +Systemsettings performance preload @@ -29,39 +28,36 @@ Performance Settings , is used on a wide variety of computers by a wide variety of users. Under the category of -performance, this dialog box allows each user to adjust options which may make the computer that is +performance, this dialog allows each user to adjust options which may make the computer that is installed on feel more responsive. -This module is divided into two tabs. - - - performance options - instances + instances The first section of this dialog is labeled Minimize Memory Usage and has three options which determine maximum number of instances of that can be open on one machine at any one time. -Do not confuse instances, with windows or tabs. The number of konqueror instances is determined by not by the user. You can think of instances as the hidden data of your windows and tabs. One 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 you can have open. +Do not confuse instances, with windows or tabs. The number of instances is determined by not by the user. You can think of instances as the hidden data of your windows and tabs. One 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 you can have open. The reason the choices you make in this dialog box are important is evident when something goes wrong and is forced to close an instance. All windows associated with a 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 +Never There are no restraints. Any number of instances can be open at any one time. The advantage of this option is if any instance crashes the remaining will be unaffected. The disadvantage is that each instance uses more memory. -For file browsing only (recommended) +For file browsing only (recommended) If this option is selected, you can have as many as you want instances open that are browsing the web, but only one instance of for file management. -Always (use with care) +Always (use with care) If this option is selected, you can only have one instance of running at any one time. This saves system memory, but if your window crashes, all your browsing windows close immediatly without warning. This should only be used for seriously memory limited systems. - -Preloading + + +Preloading The subsection labeled Preloading also makes a tradeoff between memory and performance. Preloading refers to loading an instance of into memory before a user asks to start . The positive effect of this is that when a user asks to load the window appears instantly @@ -69,12 +65,12 @@ installed on feel more responsive. could be used by other programs. By default, when a user closes , does not close the instance. This means that the next time a user wants loaded, it is nearly instantanous 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 checkbox labeled Preload an instance after startup does just what it says. It tells +The check box labeled Preload an instance after startup does just what it says. It tells to preload one instance of at the startup of . This does extend the startup time for . -The final checkbox labeled Always try to have at least one preloaded instance signals to that you always want to have one preloaded, but not used, instance of available. This option will actually decrease performance on some machines (especially those with limited
[konqueror] doc/kcontrol/kcmcss: add lang=" " to article to make the markup translatable
Git commit 76e2f5e5afa0b1d80552a019145d144f4402601d by Burkhard Lück. Committed on 22/01/2009 at 14:27. Pushed by lueck into branch 'master'. add lang="" to article to make the markup translatable svn path=/trunk/KDE/kdebase/runtime/; revision=915169 M +1-1doc/kcontrol/kcmcss/index.docbook http://commits.kde.org/konqueror/76e2f5e5afa0b1d80552a019145d144f4402601d diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook index 106cc38..f7d6d96 100644 --- a/doc/kcontrol/kcmcss/index.docbook +++ b/doc/kcontrol/kcmcss/index.docbook @@ -5,7 +5,7 @@ ]> - +
[konsole] doc/manual: Add info about shortcut for menubar and DnD options
Git commit 72ec5f6819dda101d6c4a32cb8648b07aa34aa63 by Burkhard Lück. Committed on 07/11/2016 at 19:09. Pushed by lueck into branch 'master'. Add info about shortcut for menubar and DnD options options for DnD shortcut for menubar remove extra space REVIEW:129300 M +10 -2doc/manual/index.docbook http://commits.kde.org/konsole/72ec5f6819dda101d6c4a32cb8648b07aa34aa63 diff --git a/doc/manual/index.docbook b/doc/manual/index.docbook index 38e62ca..964a6bb 100644 --- a/doc/manual/index.docbook +++ b/doc/manual/index.docbook @@ -331,6 +331,11 @@ change the working folder of the session. the actions will be executed immediately. +If you want to use the key for drag and drop or disable the context +menu to insert s as text by default, enable the corresponding options +on the Mouse tab in the profile settings dialog. + + @@ -349,7 +354,10 @@ If the menubar is hidden, window such as vi, minicom, etc.). The default shortcut is listed after each menu item. - +Alternatively you can use the shortcut +M +to show or hide the menubar. + File Menu @@ -1177,7 +1185,7 @@ Empty lines or lines with # at the beginning are ignored, --list-profile-properties -List all possible properties with name and type. See option -p . +List all possible properties with name and type. See option -p. For more information, please visit
Re: Review Request 129300: Add info about shortcut for menubar and DnD options
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129300/ --- (Updated Nov. 7, 2016, 7:10 p.m.) Status -- This change has been marked as submitted. Review request for Documentation, Konsole and Kurt Hindenburg. Changes --- Submitted with commit 72ec5f6819dda101d6c4a32cb8648b07aa34aa63 by Burkhard Lück to branch master. Repository: konsole Description --- options for DnD shortcut for menubar remove extra space Diffs - doc/manual/index.docbook 38e62ca Diff: https://git.reviewboard.kde.org/r/129300/diff/ Testing --- builds Thanks, Burkhard Lück
[Differential] [Request, 152 lines] D3304: update Konqueror docbook in the new repo
lueck created this revision. lueck added reviewers: dfaure, Documentation. lueck set the repository for this revision to R226 Konqueror. REVISION SUMMARY remove sidebar remove profiles remove bookmarkseditor, this was moved into its own docbook WebKit -> WebEngine TEST PLAN builds REPOSITORY R226 Konqueror REVISION DETAIL https://phabricator.kde.org/D3304 AFFECTED FILES doc/index.docbook EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
[Differential] [Commented On] D3275: Import konqueror kcm docbooks from kde-runtime master
lueck added a comment. David, thanks for your review. Most of the issues you raised are already on my todo list for the next review. As I pointed out in the Summary these docbooks are added to the konqueror repos as they were splitted from kde-runtime master. They are not included in build so far, the CMakeLists.txt and the dtd have to be adapted to kf5 and the docs need proofreading. I'd like to add the docbooks in the current state first and add all necessary changes in the next review/commit to get a cleaner history, so you can see how the kcm docbooks were added to the repo and what was changed later. REPOSITORY R226 Konqueror REVISION DETAIL https://phabricator.kde.org/D3275 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
[Differential] [Closed] D3274: add docbook to keditbookmarks
This revision was automatically updated to reflect the committed changes. Closed by commit R227:ba5d5fdc85ca: add docbook to keditbookmarks (authored by lueck). CHANGED PRIOR TO COMMIT https://phabricator.kde.org/D3274?vs=7942=7945#toc REPOSITORY R227 KEditBookmarks CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3274?vs=7942=7945 REVISION DETAIL https://phabricator.kde.org/D3274 AFFECTED FILES CMakeLists.txt doc/CMakeLists.txt doc/index.docbook src/org.kde.keditbookmarks.desktop EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, #documentation, dfaure
[keditbookmarks] /: add docbook to keditbookmarks
Git commit ba5d5fdc85ca7ba03c956abf11c61fb68f57f2c5 by Burkhard Lück.
Committed on 06/11/2016 at 20:11.
Pushed by lueck into branch 'master'.
add docbook to keditbookmarks
Differential Revision: https://phabricator.kde.org/D3274
M +2-1CMakeLists.txt
A +2-0doc/CMakeLists.txt
A +97 -0doc/index.docbook
M +67 -1src/org.kde.keditbookmarks.desktop
http://commits.kde.org/keditbookmarks/ba5d5fdc85ca7ba03c956abf11c61fb68f57f2c5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60b2e8a..ed07239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,13 +27,14 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
set(KEDITBOOKMARKS_VERSION "5.97.0")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n KIO
Bookmarks Parts WindowSystem IconThemes)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n KIO
Bookmarks Parts WindowSystem IconThemes DocTools)
add_definitions(-DQT_USE_FAST_CONCATENATION)
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_subdirectory(src)
+add_subdirectory(doc)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 000..0c26ae9
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION
${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR keditbookmarks)
diff --git a/doc/index.docbook b/doc/index.docbook
new file mode 100644
index 000..583a9b0
--- /dev/null
+++ b/doc/index.docbook
@@ -0,0 +1,97 @@
+
+
+
+]>
+
+
+
+
+
+The Bookmark Editor
+
+
+
+
+
+2016-11-04
+
+Applications 16.12
+
+
+bookmarks
+editor
+
+
+
+In many applications ( , , )
+the BookmarksEdit
+Bookmarks option opens the Bookmark
+Editor.
+Alternatively you can lauch the editor as standalone application
+to edit the browser bookmarks.
+The editor shows a tree view of your bookmarks and bookmark subfolders.
+As is usual for tree views in , subfolders are shown with a small
+ arrow at the left of the folder name;
+left clicking on it will expand the view to
+show the contents of that subfolder and the arrow will
+change to v; left clicking on the
+v arrow will collapse the subfolder view.
+
+To select an item in the list you can left
+click on it, or you can navigate through the list by using the
Up
+and Down keys to move around, Right to
expand a subfolder and
+Left to collapse it.
+
+You can move an item to a different place in the list by using the
+normal Drag and Drop or Cut and
+Paste methods. The order in which the items appear in
+the Bookmark Editor is the order they will appear in the
+Bookmarks drop down list. The Folder
+Insert Separator option can
+be used to insert separating lines into the list wherever you wish.
+
+A new subfolder can be created at the selected point in the list by
+using the New Folder... option in the
+Folder menu or from the drop down menu you get when you
+right click on an item in the main part of the
+window, or with N
+
+
+To change the name of a bookmark or folder select it then press
+F2 or choose the Rename item from
+the Edit menu or the pop up menu that appears when you
+right click on the item. Similarly, you can edit
+the by pressing F3 or choosing the
+Change Location menu item.
+
+The Bookmark Editor lets you import bookmarks from
+a range of other browsers into 's bookmark list, putting them into
+ a new folder or replacing all current bookmarks. To do this select
+Import from the File menu. The
+FileExport
+ option can be used to export 's bookmarks to a
+Mozilla browser.
+
+To select which bookmark subfolder is used to hold the Bookmark
+Toolbar items select the subfolder then choose Set as Toolbar
+Folder from the Folder menu.
+
+If you are tidying up your bookmarks and have forgotten what a
+particular web page is, you can easily open it from within the
+Bookmark Editor by right clicking
+on the item and selecting Open in Konqueror from
+the pop up menu. If you just want to check that the is still valid
+select Check Status instead.
+
+All your changes are automatically saved if you close
+the Bookmark Editor.
+
+
+
+
+
+
+
+
diff --git a/src/org.kde.keditbookmarks.desktop
b/src/org.kde.keditbookmarks.desktop
index 1c1f2a3..c8c9c1f 100755
--- a/src/org.kde.keditbookmarks.desktop
+++ b/src/org.kde.keditbookmarks.desktop
@@ -4,6 +4,72 @@ Exec=keditbookmarks
NoDisplay=true
Name=Bookmark Editor
Comment=Bookmark Organizer and Editor
-X-DocPath=konqueror/index.html#bookmarks
+Comment[ar]=محرِّر و منظّم العلامات
+Comment[ast]=Organizador y editor de marcadores
+Comment[bg]=Организиране и редактиране на отметки
+Comment[bn]=বুকমার্ক ব্যবস্থাপনা এবং সম্পাদনা
+Comment[bs]=Organizator i uređivač obeleživača
+Comment[ca]=Organitzador i editor d'adreces d'interès
+Comment[ca@valencia]=Organitzador i edi
[Differential] [Updated, 105 lines] D3274: add docbook to keditbookmarks
lueck updated this revision to Diff 7942. lueck marked an inline comment as done. lueck added a comment. address issues pointed out by David, thanks REPOSITORY R227 KEditBookmarks CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3274?vs=7932=7942 REVISION DETAIL https://phabricator.kde.org/D3274 AFFECTED FILES CMakeLists.txt doc/CMakeLists.txt doc/index.docbook src/org.kde.keditbookmarks.desktop EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: lueck, dfaure, #documentation
Re: Review Request 128659: Proofread/update kfind docbooks
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/128659/ --- (Updated Nov. 5, 2016, 10:01 nachm.) Status -- This change has been discarded. Review request for Documentation, KDE Base Apps, Kai Uwe Broulik, and David Faure. Repository: kde-baseapps Description --- handbook remove ENTITY kappname man page remove "a colon separated path", this does not work for me in kf5 master compiled from sources add kf5options + qt5options to refsect1 "See Also" Diffs - kfind/docs/index.docbook 5b84f68 kfind/docs/man-kfind.1.docbook 31222ea Diff: https://git.reviewboard.kde.org/r/128659/diff/ Testing --- passes checkXML5 Thanks, Burkhard Lück
