diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 96d0d7abc..5cb1742f6 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -22,7 +22,6 @@ |<>|Enable extra tools for Web developers. |<>|Whether the background color and images are also drawn when the page is printed. |<>|Whether load requests should be monitored for cross-site scripting attempts. -|<>|Enable QtWebKit workarounds for broken sites. |<>|Default encoding to use for websites. |<>|How to open links in an existing instance if a new one is launched. |<>|Which window to choose when opening links as new tabs. @@ -48,7 +47,6 @@ |<>|Whether to expand each subframe to its contents. |<>|User stylesheet to use (absolute filename or filename relative to the config directory). Will expand environment variables. |<>|Hide the main scrollbar. -|<>|Set the CSS media type. |<>|Whether to enable smooth scrolling for web pages. Note smooth scrolling does not work with the :scroll-px command. |<>|Number of milliseconds to wait before removing finished downloads. Will not be removed if value is -1. |<>|Whether to hide the statusbar unless a message is shown. @@ -147,9 +145,6 @@ |<>|Whether to prompt the user for the download location. |<>|Whether to remember the last used download directory. |<>|The maximum number of pages to hold in the global memory page cache. -|<>|The capacities for the global memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity. -|<>|Default quota for new offline storage databases. -|<>|Quota for the offline web application cache. |<>|Whether support for the HTML 5 offline storage feature is enabled. |<>|Whether support for the HTML 5 web application cache feature is enabled. |<>|Whether support for the HTML 5 local storage feature is enabled. @@ -449,26 +444,13 @@ Valid values: Default: +pass:[false]+ -[[general-site-specific-quirks]] -=== site-specific-quirks -Enable QtWebKit workarounds for broken sites. - -Valid values: - - * +true+ - * +false+ - -Default: +pass:[true]+ - -This setting is only available with the QtWebKit backend. - [[general-default-encoding]] === default-encoding Default encoding to use for websites. -The encoding must be a string describing an encoding such as _utf-8_, _iso-8859-1_, etc. If left empty a default value will be used. +The encoding must be a string describing an encoding such as _utf-8_, _iso-8859-1_, etc. -Default: empty +Default: +pass:[iso-8859-1]+ [[general-new-instance-open-target]] === new-instance-open-target @@ -658,14 +640,6 @@ Valid values: Default: +pass:[true]+ -[[ui-css-media-type]] -=== css-media-type -Set the CSS media type. - -Default: empty - -This setting is only available with the QtWebKit backend. - [[ui-smooth-scrolling]] === smooth-scrolling Whether to enable smooth scrolling for web pages. Note smooth scrolling does not work with the :scroll-px command. @@ -1342,37 +1316,7 @@ The Page Cache allows for a nicer user experience when navigating forth or back For more information about the feature, please refer to: http://webkit.org/blog/427/webkit-page-cache-i-the-basics/ -Default: empty - -This setting is only available with the QtWebKit backend. - -[[storage-object-cache-capacities]] -=== object-cache-capacities -The capacities for the global memory cache for dead objects such as stylesheets or scripts. Syntax: cacheMinDeadCapacity, cacheMaxDead, totalCapacity. - -The _cacheMinDeadCapacity_ specifies the minimum number of bytes that dead objects should consume when the cache is under pressure. - -_cacheMaxDead_ is the maximum number of bytes that dead objects should consume when the cache is *not* under pressure. - -_totalCapacity_ specifies the maximum number of bytes that the cache should consume *overall*. - -Default: empty - -This setting is only available with the QtWebKit backend. - -[[storage-offline-storage-default-quota]] -=== offline-storage-default-quota -Default quota for new offline storage databases. - -Default: empty - -This setting is only available with the QtWebKit backend. - -[[storage-offline-web-application-cache-quota]] -=== offline-web-application-cache-quota -Quota for the offline web application cache. - -Default: empty +Default: +pass:[0]+ This setting is only available with the QtWebKit backend. @@ -2384,25 +2328,25 @@ Default: empty === web-size-minimum The hard minimum font size. -Default: empty +Default: +pass:[0]+ [[fonts-web-size-minimum-logical]] === web-size-minimum-logical The minimum logical font size that is applied when zooming out. -Default: empty +Default: +pass:[6]+ [[fonts-web-size-default]] === web-size-default The default font size for regular text. -Default: empty +Default: +pass:[16]+ [[fonts-web-size-default-fixed]] === web-size-default-fixed The default font size for fixed-pitch text. -Default: empty +Default: +pass:[13]+ [[fonts-keyhint]] === keyhint