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 -6 doc/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 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2009-12-18</date> -<releaseinfo>&kde; 4.4</releaseinfo> +<date>2011-11-22</date> +<releaseinfo>&kde; 4.8</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -27,10 +27,7 @@ </articleinfo> <sect1 id="konq-general-behavior"> <title>General &konqueror; Behavior</title> -<!-- 4.6 -Provide an easier way to select the preferred web engine in Konqueror -http://lists.kde.org/?l=kde-doc-english&m=128516638109185&w=2 ---> + <para>On this page you find settings for home and start page and the behavior of tabbed browsing both for &konqueror;'s file manager and browser mode.</para> @@ -57,6 +54,16 @@ button in the toolbar is replaced by a <guilabel>Home Folder</guilabel> button which makes it jump to your local home folder instead.</para> </listitem> </varlistentry> +<varlistentry> +<term><guilabel>Default web browser engine</guilabel></term> +<listitem><para> +This option provides an easy way to select the preferred web engine in &konqueror;, either +<guilabel>KHTML</guilabel> or <guilabel>Webkit</guilabel>, if installed. +Using the <menuchoice><guimenu>View</guimenu><guimenuitem>View Mode</guimenuitem></menuchoice> +menu allows you to change the web engine temporarily on the fly. +</para> +</listitem> +</varlistentry> <varlistentry> <term><guilabel>Open links in