start of konqui's doc update

svn path=/trunk/KDE/kdebase/apps/; revision=1087154

doc/konqueror/basics.docbook

@@ -51,7 +51,7 @@ Browser</guimenuitem></menuchoice> to start it as a browser, or
 <listitem><para><keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>
 will open a <guilabel>Run Command</guilabel> dialog box, type
 <userinput><command>konqueror</command></userinput> (lower case) and press
-<keycap>Enter</keycap> or the <guibutton>Run</guibutton> button to start in
+&Enter; or the <guibutton>Run</guibutton> button to start in
 file
 manager mode, or just enter a &URL; such as
  <userinput>http://www.konqueror.org</userinput> to start &konqueror; as a
@@ -171,11 +171,10 @@ this entire document if you take advantage of <guilabel>Tooltips</guilabel> and
  the 
 <guimenuitem>What's This?</guimenuitem> feature.</para>
 
-<para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (K menu
- <menuchoice><guimenu>Control Center</guimenu><guisubmenu>Appearance &amp;
- Themes</guisubmenu><guisubmenu>Style</guisubmenu></menuchoice>,
- <guilabel>Style</guilabel> dialog) then when you hover the mouse pointer
- over a Toolbar or Navigation Panel 
+<para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (
+in &systemsettings; <menuchoice><guimenu>Appearance</guimenu>
+<guisubmenu>Windows</guisubmenu></menuchoice>, <guilabel>Buttons</guilabel> tab) 
+then when you hover the mouse pointer over a Toolbar or Navigation Panel 
 button it should bring up a terse description of what that button does.</para>
 
 <para><guimenuitem>What's This?</guimenuitem> is invoked by the Menubar

doc/konqueror/config.docbook

@@ -6,8 +6,8 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2003-11-06</date>
-<releaseinfo>3.2</releaseinfo>
+<date>2010-02-07</date>
+<releaseinfo>4.4.0</releaseinfo>
 </chapterinfo>
 
 
@@ -23,8 +23,8 @@ wishes.</para>
 <para>When &kde; is newly installed, &konqueror;'s window contains a Menubar, 
 Main and Location Toolbars and possibly a Bookmark Toolbar.</para>
 
-<para>Maybe you don't need all these toolbars. To hide one of them, go into 
-the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Toolbars</guisubmenu>
+<para>Maybe you don not need all these toolbars. To hide one of them, go into 
+the <menuchoice><guimenu>Settings</guimenu><guisubmenu>Toolbars Shown</guisubmenu>
 </menuchoice> menu and uncheck its box. To show a hidden toolbar, just check 
 the box.</para> 
 
@@ -32,24 +32,19 @@ the box.</para>
 combination <keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>.
 </para>
 
-<!-- FIXME -->
-<para>On the left hand end of each bar you can see some vertical 
-lines. By &LMB; clicking on them, you <quote>flatten</quote> the bar, meaning 
-that it is hidden but can be quickly restored by clicking on the now 
-horizontal lines. You can also drag a bar into a new position with these 
-lines.</para>
-
 <para>If you <mousebutton>right</mousebutton> click on a Toolbar, you 
-will get a menu to configure this bar. You can choose the orientation, text 
-position and icon size</para>
+will get a menu to configure this bar. You can lock or unlock the toolbar position
+and choose the text position, icon size and the orientation of unlocked bars.</para>
+
+<para>If the toolbars are unlocked, on the left hand end of each bar you can see  
+some handles. By &LMB; clicking on them, you can drag a bar into a new position
+and even detach it from the window and place it anywhere on your screen.</para>
 
 <para>The icons shown in the various bars can be changed by using the 
 <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure 
 Toolbars...</guimenuitem></menuchoice> option, which brings up the 
-<guilabel>Configure Toolbars</guilabel> dialog box. The Main and Extra Toolbars
-are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main
-Toolbar &lt;khtmlpart&gt; and Extra Toolbar &lt;khtmlsettingsplugin&gt;. The
-number and type of these sections will depend on whether &konqueror; is in Web
+<guilabel>Configure Toolbars</guilabel> dialog box. The
+number and type of these toolbars will depend on whether &konqueror; is in Web
 Browser or File Manager mode and whether you have &konqueror; plugins
 installed.</para>
 
@@ -69,16 +64,16 @@ installed.</para>
 <phrase>Shortcut config screenshot 1</phrase>
 </textobject>
 </mediaobject>
-<para>Search through the combo box to find the action you want to add or 
+<para>Use the search box to find the action you want to add or 
 change the shortcut keys for and select it by <mousebutton>left</mousebutton> 
-clicking on the name. You will then be able to change the shortcut by 
-selecting the <guilabel>None</guilabel>, <guilabel>Default</guilabel> or 
-<guilabel>Custom</guilabel> radio button or by clicking on the large button in 
-the <guilabel>Shortcut for Selected Action</guilabel> area.</para>
+clicking on the name. </para>
+
+<para>After you have selected an action in the list you will notice that
+this item is highlighted and you see two additional check boxes below
+this item in the list view. There you can configure a
+combination of keys or maybe no key binding at all for the selected
+action. </para>
 
-<para>If you select <guilabel>Define Shortcut</guilabel>, and then
-select <guilabel>Advanced</guilabel>, the dialog box below will be shown:
-</para>
 <mediaobject>
 <imageobject>
 <imagedata fileref="shortcut2.png" format="PNG"/>
@@ -87,37 +82,95 @@ select <guilabel>Advanced</guilabel>, the dialog box below will be shown:
 <phrase>Shortcut config screenshot 2</phrase>
 </textobject>
 </mediaobject>
-<para>Choose whether you want to change the <guilabel>Primary</guilabel> or 
-<guilabel>Alternate</guilabel> shortcut then press the key combination you 
-want to act as the shortcut, for example <keycombo action="simul">
-&Ctrl;&Shift;<keycap>S</keycap></keycombo>. 
-If the <guilabel>Auto-Close</guilabel> box is checked the dialog will vanish 
-as soon as you enter the key combination, otherwise it will remain until you 
-press <guibutton>OK</guibutton> or <guibutton>Cancel</guibutton>. Clicking on 
-the little black icon with a white cross in it clears the shortcut.</para>
 
+<itemizedlist>
+<listitem><para><guilabel>Default</guilabel>: the selected action
+will be associated with &kde;'s default value. This is a good choice
+for most actions, as &kde; comes with reasonable key bindings we have
+thought about. </para></listitem>
+<listitem><para><guilabel>Custom</guilabel>: if this option is
+enabled, you can create a key combination for the selected
+action. Click on the button labeled either <guibutton>None</guibutton>
+or labeled with the previously selected custom shortcut. Now the button label
+changes to <guibutton>Input</guibutton>. Then press any modifier key
+(&ie; &Shift;, &Ctrl;, or &Alt;) and then normal key or a function key (&eg; <keycap>F11</keycap>)
+you want to assign to this key combination.</para></listitem>
+<listitem><para>You can reset the shortcut to <guilabel>None</guilabel> by using 
+this button: <inlinemediaobject><imageobject> <imagedata
+fileref="reset.png" format="PNG"/></imageobject></inlinemediaobject>.
+</para>
+<para>Clicking on the <guilabel>Alternate</guilabel> column of a row in the list
+allows to edit the second shortcut for the action.</para></listitem>
+</itemizedlist>
+
+<!--not in 4.4 ?-->
 <sect2 id="userdefmenus">
 <title>User Defined Menus</title>
 <para>You can add your own pop up menu to &konqueror; so that pressing one key 
 combination will make the menu appear then pressing a second key, or using the 
 <keysym>Up arrow</keysym> and <keysym>Down arrow</keysym> keys and pressing 
-<keycap>Enter</keycap>, will select an item from it.</para>
+&Enter;, will select an item from it.</para>
 <para>To do this add a <guilabel>Custom</guilabel> shortcut for each of the 
 actions you want to appear in the menu and in the <guilabel>Define Shortcut
 </guilabel> dialog check the <guilabel>Multi-Key</guilabel> box, press the 
 key combination that you want to bring up your new menu then, separately, 
 press the key that will choose that item from the menu.</para>
 </sect2>
+<!--not in 4.4 ?-->
 </sect1>
 
 <sect1 id="othersettings">
 <title>Other Settings</title>
 <para>Selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>
 Configure Konqueror...</guimenuitem></menuchoice> brings up a dialog box 
-which you can use to control most aspects of &konqueror;'s behavior. 
-It contains several sections which are selected by <mousebutton>left
+which you can use to control most aspects of &konqueror;'s behavior.</para> 
+<para>It contains these sections which are selected by <mousebutton>left
 </mousebutton> clicking on one of the icons at the left of the dialog 
-box.</para>
+box:</para>
+<itemizedlist>
+<listitem><para><ulink url="help:/kcontrol/khtml-general/index.html">General</ulink>: 
+Configure general &konqueror; behavior</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/performance/index.html">Performance</ulink>: 
+Configure settings that can improve &konqueror; performance</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/bookmarks/index.html">Bookmarks</ulink>: 
+Configure the bookmarks home page</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/filemanager/index.html">File Management</ulink>: 
+You can configure how Konqueror behaves as a file manager here</para></listitem>
+<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-viewmodes">View Modes</ulink>: 
+Configure file manager view modes</para></listitem>
+<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-navigation">Navigation</ulink>: 
+Configure file manager navigation</para></listitem>
+<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-services">Services</ulink>: 
+Configure file manager services</para></listitem>
+<listitem><para><ulink url="help:/dolphin/index.html#preferences-dialog-general">General</ulink>: 
+Configure general file manager settings</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/filetypes/index.html">File Associations</ulink>: 
+Configure file associations</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/trash/index.html">Trash</ulink>: 
+Configure trash settings</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/khtml-behavior/index.html">Web Browsing</ulink>: 
+Configure the browser behavior</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/proxy/index.html">Proxy</ulink>: 
+Configure the proxy servers used</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/kcmcss/index.html">Appearance</ulink>: 
+Configure how to display web pages</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/khtml-adblock/index.html">AdBlocK Filters</ulink>: 
+Configure &konqueror; AdBlocK filters</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/ebrowsing/index.html">Web Shortcuts</ulink>: 
+Configure enhanced browsing</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/cache/index.html">Cache</ulink>: 
+Configure web cache settings</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/history/index.html">History</ulink>: 
+Configure the history sidebar</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/cookies/index.html">Cookies</ulink>: 
+Configure the way cookies work</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/useragent/index.html">Browser Identification</ulink>: 
+Configure the way Konqueror reports itself</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/khtml-java-js/index.html">Java &amp; JavaScript</ulink>: 
+Configure the behavior of Java and JavaScript</para></listitem>
+<listitem><para><ulink url="help:/kcontrol/khtml-plugins/index.html">Plugins</ulink>: 
+Configure the browser plugins</para></listitem>
+</itemizedlist>
 <para>Pressing the <guibutton>Help</guibutton> button will give you 
 detailed instructions about how to use each of these sections, or you can 
 use the <link linkend="bubble">What's This?</link> feature.</para>