30 files changed, 35 insertions, 78 deletions

diff --git a/doc/Rekonq-adblockconfiguration-manual.png b/doc/Rekonq-adblockconfiguration-manual.png
index 8386184e..500223b5 100644
--- a/doc/Rekonq-adblockconfiguration-manual.png
+++ b/doc/Rekonq-adblockconfiguration-manual.png
diff --git a/doc/Rekonq-adblockconfiguration.png b/doc/Rekonq-adblockconfiguration.png
index 58433f55..9261cc66 100644
--- a/doc/Rekonq-adblockconfiguration.png
+++ b/doc/Rekonq-adblockconfiguration.png
diff --git a/doc/Rekonq-akregator.png b/doc/Rekonq-akregator.png
index c26b73b0..d4353605 100644
--- a/doc/Rekonq-akregator.png
+++ b/doc/Rekonq-akregator.png
diff --git a/doc/Rekonq-ftp.png b/doc/Rekonq-ftp.png
index 5aa7fd55..526bbe09 100644
--- a/doc/Rekonq-ftp.png
+++ b/doc/Rekonq-ftp.png
diff --git a/doc/Rekonq-kget.png b/doc/Rekonq-kget.png
index 56394fb8..7772a996 100644
--- a/doc/Rekonq-kget.png
+++ b/doc/Rekonq-kget.png
diff --git a/doc/Rekonq-manualplugins-youtube.png b/doc/Rekonq-manualplugins-youtube.png
index 3ccb3557..7ac2c3ab 100644
--- a/doc/Rekonq-manualplugins-youtube.png
+++ b/doc/Rekonq-manualplugins-youtube.png
diff --git a/doc/Rekonq-manualplugins.png b/doc/Rekonq-manualplugins.png
index 4f018fcc..440e4840 100644
--- a/doc/Rekonq-manualplugins.png
+++ b/doc/Rekonq-manualplugins.png
diff --git a/doc/Rekonq-newtab.png b/doc/Rekonq-newtab.png
index de3be4c5..5ca394d5 100644
--- a/doc/Rekonq-newtab.png
+++ b/doc/Rekonq-newtab.png
diff --git a/doc/Rekonq-notabs.png b/doc/Rekonq-notabs.png
index e78549e5..82b8f7bd 100644
--- a/doc/Rekonq-notabs.png
+++ b/doc/Rekonq-notabs.png
diff --git a/doc/Rekonq-okularkpart.png b/doc/Rekonq-okularkpart.png
index 95b7b7b6..40db40ce 100644
--- a/doc/Rekonq-okularkpart.png
+++ b/doc/Rekonq-okularkpart.png
diff --git a/doc/Rekonq-panels.png b/doc/Rekonq-panels.png
index 0b2f5ced..29a0c904 100644
--- a/doc/Rekonq-panels.png
+++ b/doc/Rekonq-panels.png
diff --git a/doc/Rekonq-privatebrowsing.png b/doc/Rekonq-privatebrowsing.png
index a713b4e8..53b05d7b 100644
--- a/doc/Rekonq-privatebrowsing.png
+++ b/doc/Rekonq-privatebrowsing.png
diff --git a/doc/Rekonq-sslinfo.png b/doc/Rekonq-sslinfo.png
index 2dcbc059..cfd42655 100644
--- a/doc/Rekonq-sslinfo.png
+++ b/doc/Rekonq-sslinfo.png
diff --git a/doc/Rekonq-tabpreview.png b/doc/Rekonq-tabpreview.png
index 496fc85f..f2a00338 100644
--- a/doc/Rekonq-tabpreview.png
+++ b/doc/Rekonq-tabpreview.png
diff --git a/doc/Rekonq-toolbar.png b/doc/Rekonq-toolbar.png
index 304700bb..5d4693a8 100644
--- a/doc/Rekonq-toolbar.png
+++ b/doc/Rekonq-toolbar.png
diff --git a/doc/Rekonq-urlbar.png b/doc/Rekonq-urlbar.png
index 82542fdb..4f604ea0 100644
--- a/doc/Rekonq-urlbar.png
+++ b/doc/Rekonq-urlbar.png
diff --git a/doc/Rekonq-windowtabbing.png b/doc/Rekonq-windowtabbing.png
index 812e7f83..c68e0ab6 100644
--- a/doc/Rekonq-windowtabbing.png
+++ b/doc/Rekonq-windowtabbing.png
diff --git a/doc/appearance.png b/doc/appearance.png
index dd816219..38d9e871 100644
--- a/doc/appearance.png
+++ b/doc/appearance.png
diff --git a/doc/appearance_misc.png b/doc/appearance_misc.png
deleted file mode 100644
index 9cb9b9ee..00000000
--- a/doc/appearance_misc.png
+++ /dev/null
diff --git a/doc/appearance_stylesheets.png b/doc/appearance_stylesheets.png
deleted file mode 100644
index 3856760e..00000000
--- a/doc/appearance_stylesheets.png
+++ /dev/null
diff --git a/doc/cache.png b/doc/cache.png
deleted file mode 100644
index 29cc537c..00000000
--- a/doc/cache.png
+++ /dev/null
diff --git a/doc/cookies.png b/doc/cookies.png
deleted file mode 100644
index a162a511..00000000
--- a/doc/cookies.png
+++ /dev/null
diff --git a/doc/fonts.png b/doc/fonts.png
deleted file mode 100644
index c8aeea52..00000000
--- a/doc/fonts.png
+++ /dev/null
diff --git a/doc/general.png b/doc/general.png
index 9737e64c..920c609c 100644
--- a/doc/general.png
+++ b/doc/general.png
diff --git a/doc/index.docbook b/doc/index.docbook
index 3089ed3c..e9427401 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -53,8 +53,8 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
     </authorgroup>
 <legalnotice>&FDLNotice;</legalnotice>
-<date>2012-04-07</date>
-    <releaseinfo>0.9.0 (&kde; SC 4.8)</releaseinfo>
+<date>2012-06-02</date>
+    <releaseinfo>0.9.61 (&kde; SC 4.8)</releaseinfo>
 <abstract>
 <para></para>
     </abstract>
@@ -121,7 +121,7 @@
   </mediaobject>
 </screenshot>
 </para>
-<para>By default, the &rekonq; window uses only one toolbar. This main toolbar consists of four navigation buttons (<guilabel>back</guilabel>, <guilabel>forward</guilabel>, <guilabel>home</guilabel>, <guilabel>reload/stop</guilabel>), the URL bar and two menu/buttons, one for <guilabel>bookmarks</guilabel> and one for the <guilabel>settings</guilabel>. This minimalist approach to the main toolbar marks the most significant user-interface departure from the traditional multi-toolbar paradigm followed by most other browsers like &konqueror;.
+<para>By default, the &rekonq; window uses only one toolbar. This main toolbar consists of four navigation buttons (<guilabel>back</guilabel>, <guilabel>forward</guilabel>, <guilabel>reload/stop</guilabel>), the URL bar and a menu/button <guilabel>settings</guilabel>. This minimalist approach to the main toolbar marks the most significant user-interface departure from the traditional multi-toolbar paradigm followed by most other browsers like &konqueror;.
 </para>
 <para>Further, the main toolbar offers only limited customization &ndash; <guilabel>orientation</guilabel> (locked at the top of the window, by default), <guilabel>icon size</guilabel> (medium, by default) and <guilabel>icon labels</guilabel> (not shown, by default). This helps keep the &rekonq; UI simple and puts the focus on the webpage on display.
 </para>
@@ -408,7 +408,6 @@
 <para>&rekonq; supports full-screening the webpage straight from the configuration menu button or through a keyboard shortcut (<keycombo>&Ctrl;&Shift;<keycap>F</keycap></keycombo>, by default). In the full screen view, the main toolbar will auto-hide and the webpage will be displayed over your entire screen.
 </para>
 </chapter>
-<!--
 <chapter id="zoom-slider"><title>Zoom slider</title>
 <para>
 <screenshot>
@@ -418,18 +417,19 @@
       <imagedata fileref="Rekonq-zoom.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; showing the zoom slider in the configuration menu</phrase>
+      <phrase>&rekonq; showing the zoom slider at the bottom of the window</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; showing the zoom slider in the configuration menu</para>
+      <para>&rekonq; showing the zoom slider at the bottom of the window</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
 <para>&rekonq; has a slider to adjust the zoom right from the configuration menu with a handy button to restore the zoom back to default. Of course, you can still use keyboard (<keycombo>&Ctrl;<keycap>+/-</keycap></keycombo>) or mouse (<keycombo>&Ctrl;<keycap> mouse scroll up/down</keycap></keycombo>) shortcuts just the same.
 </para>
+<para>The zoom slider can be enabled (or disabled) with <keycombo>&Ctrl;<keycap>Y</keycap></keycombo> or with <guimenuitem>Zoom...</guimenuitem> from <guilabel>settings</guilabel> menu.
+</para>
 </chapter>
--->
 <chapter id="Config-rekonq">
 <title>Detailed &rekonq; configuration</title>
 
@@ -577,7 +577,7 @@ Here a list of configurable points and explanation for it:
 </para>
 
 <para>
-  Following will explain the configurable things and what they do on <guilabel>Fonts</guilabel> tab.
+  Following will explain the configurable things and what they do on the <guilabel>Fonts</guilabel> pane.
 </para>
 <variablelist>
   <varlistentry>
@@ -613,51 +613,24 @@ Here a list of configurable points and explanation for it:
     <listitem><para>You can configure the minimal size of fonts in &rekonq;. Every smaller font will grow to that size.</para></listitem>
   </varlistentry>
 </variablelist>
-<para>On <guilabel>Stylesheets</guilabel> tab:</para>
 
-<para>
-<screenshot>
-<screeninfo>Now you should see this</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="appearance_stylesheets.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Screenshot</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
-</para>
+<para>On the <guilabel>Character Encoding</guilabel> pane:</para>
 
 <variablelist>
   <varlistentry>
-    <term><guilabel>Path to custom CSS file:</guilabel></term>
-    <listitem><para>Here you can set the path to your CSS file used to format webpages.</para></listitem>
+    <term><guilabel>Default character encoding:</guilabel></term>
+    <listitem><para>Here you can explicitly set the encoding for the pages without prescribed encoding. Use the common encoding of your native language.</para></listitem>
   </varlistentry>
 </variablelist>
-<para>On <guilabel>Misc</guilabel> tab:</para>
 
-<para>
-<screenshot>
-<screeninfo>Now you should see this</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="appearance_misc.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Screenshot</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
-</para>
+<para>On the <guilabel>Custom Style Sheet</guilabel> pane:</para>
 
 <variablelist>
   <varlistentry>
-    <term><guilabel>Enable smooth scrolling</guilabel></term>
-    <listitem><para>If you enable this option &rekonq; will use smooth scrolling. Uncheck this option if the scrolling becomes choppy.</para></listitem>
+    <term><guilabel>Path to custom CSS file:</guilabel></term>
+    <listitem><para>Here you can set the path to your CSS file used to format webpages.</para></listitem>
   </varlistentry>
 </variablelist>
-
 </sect1>
 
 <sect1 id="Webkit">
@@ -680,20 +653,16 @@ Here a list of configurable points and explanation for it:
 
 </sect1>
 
-<sect1 id="Network">
+<sect1 id="Privacy">
 
-<title>Network configuration</title>
-
-<sect2 id="Cookies">
-
-<title>Handling of Cookies with &rekonq;</title>
+<title>Privacy configuration</title>
 
 <para>
 <screenshot>
-<screeninfo>This is a screenshot of the cookie settings dialog</screeninfo>
+<screeninfo>Now you should see this</screeninfo>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="cookies.png" format="PNG"/>
+	    <imagedata fileref="privacy.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
 	    <phrase>Screenshot</phrase>
@@ -703,29 +672,20 @@ Here a list of configurable points and explanation for it:
 </para>
 
 <para>
-As you can see the cookies can be configured in many ways.
-</para>
-
-<para>
-&rekonq; can handle cookies in three ways by default
-<itemizedlist>
-<listitem><para><guilabel>Ask for confirmation</guilabel></para></listitem>
-<listitem><para><guilabel>Accept all cookies</guilabel></para></listitem>
-<listitem><para><guilabel>Reject all cookies</guilabel></para></listitem>
-</itemizedlist>
+  As you can see using this page you can control Javascript, tracking, history, passwords, <ulink url="help:kcontrol/cookies">cookies</ulink>, and <ulink url="help:kcontrol/cache">cache</ulink> settings of &rekonq;.
 </para>
-</sect2>
 
-<sect2 id="Rest">
+</sect1>
 
-<title>Rest</title>
+<sect1 id="Advanced">
+<title>Advanced configuration</title>
 
 <para>
 <screenshot>
 <screeninfo>Now you should see this</screeninfo>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="cache.png" format="PNG"/>
+	    <imagedata fileref="advanced.png" format="PNG"/>
 	  </imageobject>
 	  <textobject>
 	    <phrase>Screenshot</phrase>
@@ -734,27 +694,24 @@ As you can see the cookies can be configured in many ways.
 </screenshot>
 </para>
 
-<para>
-<screenshot>
-<screeninfo>Now you should see this</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="proxy.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Screenshot</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
-</para>
-</sect2>
+ <para>Using <guilabel>Proxy</guilabel> pane you can access the system wide proxy server settings. Just press <guibutton>Change them!</guibutton> to open the <ulink url="help:kcontrol/proxy">corresponding &systemsettings; module</ulink>.</para>
+
+<para>On the <guilabel>Misc</guilabel> pane you can configure various aspects controlling the browser.</para>
 
+<variablelist>
+  <varlistentry>
+    <term><guilabel>Enable smooth scrolling</guilabel></term>
+    <listitem><para>If you enable this option &rekonq; will use smooth scrolling. Uncheck this option if the scrolling becomes choppy.</para></listitem>
+  </varlistentry>
+</variablelist>
 </sect1>
 
 <sect1 id="Shortcut">
 
 <title>Configure the Shortcut settings</title>
 
+ <!-- Add the link to KDE fundamentals on shortcuts configuration here later on! -->
+
 <para>
 <screenshot>
 <screeninfo>Now you should see this</screeninfo>
@@ -895,7 +852,7 @@ As you can see the cookies can be configured in many ways.
 <sect1 id="how-do-i-enable-adblock"><title>How do I enable Adblock?</title>
 <para>Adblocking should already be enabled for you using the <guilabel>Easylist</guilabel> adblock subscription. You can further configure it by clicking on the configuration menu button and choosing <menuchoice><guisubmenu>Tools</guisubmenu> <guimenuitem>Ad Block</guimenuitem> </menuchoice> to open <guilabel>Ad Block Settings</guilabel> dialog. Click on <guilabel>AdBlocK Filters</guilabel>. Here, you can add custom filters using wildcard strings (e.g. <command>http://www.site.com/ads/*</command>) or regular expressions within forward slashes (e.g. <userinput>//(ads|dclk)\./</userinput>).
 </para>
-<para>Clicking <guilabel>Apply</guilabel> activates your adblock filters instantly.
+<para>Clicking <guilabel>OK</guilabel> activates your adblock filters instantly.
 </para>
 <para>
 <screenshot>
diff --git a/doc/proxy.png b/doc/proxy.png
deleted file mode 100644
index 107e147b..00000000
--- a/doc/proxy.png
+++ /dev/null
diff --git a/doc/shortcuts.png b/doc/shortcuts.png
index e5ba21d2..1cd7e792 100644
--- a/doc/shortcuts.png
+++ b/doc/shortcuts.png
diff --git a/doc/tabs.png b/doc/tabs.png
index fde0fd20..cdc960b6 100644
--- a/doc/tabs.png
+++ b/doc/tabs.png
diff --git a/doc/webkit.png b/doc/webkit.png
index da644f03..1b7feb16 100644
--- a/doc/webkit.png
+++ b/doc/webkit.png
diff --git a/doc/webshortcuts.png b/doc/webshortcuts.png
index cce71724..7e5bcf01 100644
--- a/doc/webshortcuts.png
+++ b/doc/webshortcuts.png