diff --git a/doc/kcontrol/khtml-adblock/index.docbook b/doc/kcontrol/khtml-adblock/index.docbook
index 41d5cf619..e153d5f4a 100644
--- a/doc/kcontrol/khtml-adblock/index.docbook
+++ b/doc/kcontrol/khtml-adblock/index.docbook
@@ -1,86 +1,90 @@
]>
AdBlocK Filters
&Krishna.Tateneni; &Krishna.Tateneni.mail;
2011-11-22
&kde; 4.8
&konqueror; AdBlocK can be configured to replace or remove
images or frames from web pages that match a series of filters.
The setting Enable filters enables or
disables the use of list of URL filters.
If Hide filtered images is enabled then
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.
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.
Use the Search edit box above the list box
to filter matching entries an the fly.
Each filter can either be expressed as a file style wildcard
string (e.g. http://www.site.com/ads/*) or as a full regular expression
by enclosing the filter with forward slashes (e.g. //(ads|dclk)\./).
Any filter string can be preceded by @@ to whitelist
(allow) any matching &URL;, which takes priority over any blacklist (blocking)
filter.
Import and Export will
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 &URL;'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 &RMB; click on this icon to open the context menu with actions to show all blockable
elements on a web page, open this &systemsettings; module and disable blocking for a site
or page temporarily.
A click with the &LMB; 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 &systemsettings;
module.
diff --git a/doc/kcontrol/khtml-java-js/index.docbook b/doc/kcontrol/khtml-java-js/index.docbook
index 6ec655237..d7f6ad9d6 100644
--- a/doc/kcontrol/khtml-java-js/index.docbook
+++ b/doc/kcontrol/khtml-java-js/index.docbook
@@ -1,141 +1,145 @@
]>
Java and JavaScript
&Krishna.Tateneni; &Krishna.Tateneni.mail;
2009-11-24
&kde; 4.4
KDE
Systemsettings
konqueror
browsing
Java
JavaScript
&Java; and JavaScript
&Java;
&Java; allows applications to be downloaded and run by a web
browser, provided you have the necessary software installed on your
machine. Many web sites make use of &Java; (for example, online
banking services or interactive gaming sites). You should be aware
that running programs from unknown sources could pose a threat to the
security of your computer, even if the potential extent of the damage
is not great.
The check box Enable Java globally allows
you to turn &Java; support on for all web sites by default. You can
also select to turn &Java; on or off for specific hosts. To add a
policy for a specific host, click the New...
button to bring up a dialog in which you can type the host name and
then choose to accept or reject &Java; code from that particular host,
which will add the domain to the list on the left of the page.
You can select a host in the list, and click the
Change... button to choose a different policy for
that host. Clicking the Delete button removes the
policy for the selected host; after deletion, the global settings will
then apply to that host.
Finally, the group of controls labeled Java Runtime
Settings allows you to set some options for the way in
which &Java; should run.
Use security
manager is normally enabled by default. This setting will
cause the JVM to run with a Security Manager in place. This will keep
applets from being able to read and write to your file system, creating
arbitrary sockets, and other actions which could be used to compromise
your system. Disable this option at your own risk. You can modify your
$HOME/.java.policy file with the
&Java; policytool utility to give code downloaded from certain sites
more permissions.
Use KIO will cause the
JVMto use &kde;'s own KIO
transports for network connections.
The Shutdown applet server when inactive for more than
check box allows you to save resources by closing the &Java; Applet
Server when it is not in use, rather than leaving it running in the
background. Leaving this disabled may make &Java; applets start up
faster, but it will use system resources when you are not using a
&Java; applet. If you enable this, you can set a timeout.
You can either opt to have &konqueror; automatically detect the
&Java; installation on your system, or specify the path to the
installation yourself by selecting Path to Java
executable or 'java'. You may want to choose the latter method, for
instance, if you have multiple &Java; installations on your system,
and want to specify which one to use. If the &Java; Virtual Machine
you are using requires any special startup options, you can type them
in the text box labeled Additional Java
arguments.
JavaScript
Despite the name, JavaScript is not related at all to
&Java;.
The first part of this tab works the same as the &Java; settings.
The checkbox Enable JavaScript globally allows
you to turn JavaScript support on for all web sites by default. You
can also select to turn JavaScript on or off for specific hosts. To
add a policy for a specific host, click the
New... button to bring up a dialog in which you
can type the host name and then choose to accept or reject JavaScript
code from that particular host, which will add the domain to the list
on the left of the page.
You can select a host in the list, and click the
Change... button to choose a different policy for
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.
You can individually enable or disable the ability of JavaScript
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
set &konqueror; to Allow all such requests,
Ask each time a request is made, or
Deny all popup requests.
The Smart setting will only allow
JavaScript popup windows when you have explicitly chosen a link that
creates one.