[kde-doc-english] [kate] doc/kate: Update Kate handbook to 16.04

Burkhard Lück lueck at hube-lueck.de
Sat May 7 10:50:29 UTC 2016


Git commit 09843e2eca533898d6c32e4e88a090355a645b06 by Burkhard Lück.
Committed on 07/05/2016 at 10:50.
Pushed by lueck into branch 'master'.

Update Kate handbook to 16.04

Sync kate docbook with https://git.reviewboard.kde.org/r/127601/ Remove Editor Component Extensions from katepart
Sync menu items
REVIEW:127841

M  +2    -2    doc/kate/configuring.docbook
M  +1    -11   doc/kate/development.docbook
M  +25   -44   doc/kate/fundamentals.docbook
M  +4    -7    doc/kate/index.docbook
M  +787  -770  doc/kate/menus.docbook
M  +54   -344  doc/kate/plugins.docbook

http://commits.kde.org/kate/09843e2eca533898d6c32e4e88a090355a645b06

diff --git a/doc/kate/configuring.docbook b/doc/kate/configuring.docbook
index 444e625..5d11629 100644
--- a/doc/kate/configuring.docbook
+++ b/doc/kate/configuring.docbook
@@ -147,7 +147,7 @@ linkend="fundamentals-using-sessions">using sessions</link>.</para>
 
 <varlistentry>
 <term><anchor id="config-dialog-sessions-elements"/>
-<guilabel>Elements of Sessions</guilabel></term>
+<guilabel>Session Elements</guilabel></term>
 <listitem>
 <variablelist>
 <varlistentry>
@@ -211,7 +211,7 @@ will appear as a child of this page.</para>
 
 </sect2>
 
-<sect2 id="config-dialog-treeview">
+<sect2 id="config-dialog-treeview"><!--FIXME move to plugin -->
 <title>Documents</title> <!-- Tree View was renamed to Documents - http://commit-digest.org/issues/2011-08-28/ -->
 <!-- Tree View plugin http://kate-editor.org/2010/09/10/tree-view-plugin-introduction/ -->
 <variablelist>
diff --git a/doc/kate/development.docbook b/doc/kate/development.docbook
index 1c70411..a775953 100644
--- a/doc/kate/development.docbook
+++ b/doc/kate/development.docbook
@@ -12,8 +12,7 @@
 
 <para>Like any advanced text editor, &kate; offers a variety of ways to extend
 its functionality.  You can <link linkend="dev-scripting">write simple scripts
-to add functionality with JavaScript</link>, add enhanced functionality to the
-editor component with <link linkend="dev-part">Editor Component Plugins</link>,
+to add functionality with JavaScript</link>
 or add even more functionality to the editor itself with 
 <link linkend="dev-app">&kate; Application Plugins written in C++</link>. 
 Finally, once you have extended &kate;, you are welcome to
@@ -41,15 +40,6 @@ section of the Development chapter of the &katepart; Handbook</ulink>.</para>
 
 </sect1>
 
-<sect1 id="dev-part">
-<title>Editor Component Extensions</title>
-
-<para>For information about writing &katepart; plugins, see the
-<ulink url="help:/katepart/dev-part.html">Editor Component Extensions
-section of the Development chapter of the &katepart; Handbook</ulink>.</para>
-
-</sect1>
-
 <sect1 id="dev-app">
 <title>&kate; (C++) Application Plugins</title>
 
diff --git a/doc/kate/fundamentals.docbook b/doc/kate/fundamentals.docbook
index f016585..3f6bcc2 100644
--- a/doc/kate/fundamentals.docbook
+++ b/doc/kate/fundamentals.docbook
@@ -171,6 +171,12 @@ downloaded to a temporary) and should be reuploaded, after you saved it.
 deleted (if they are local files and you have sufficient permissions) when
 closed, unless they were modified since they were opened.</para></listitem>
 </varlistentry>
+<!--FIXME usecase? -->
+<varlistentry>
+<term><userinput><command>kate</command>
+<option>--desktopfile</option> <parameter>filename</parameter></userinput></term>
+<listitem><para>The base file name of the desktop entry for this application.</para></listitem>
+</varlistentry>
 
 <varlistentry>
 <term><userinput><command>kate</command>
@@ -250,15 +256,21 @@ the file you are editing and the <guilabel>Documents</guilabel> on the side bar
 name of the file. Use the <guilabel>Filesystem Browser</guilabel> window to open files.
 </para>
 
-<para> <!-- Show Sidebars Ctrl+Alt+Shift+F-->
-You can toggle the Documents and Filesystem Browser window on and off in
+<para>
+You can toggle the sidebars window on and off in 
 <menuchoice><guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu></menuchoice>
-menu. This menu offers you your first glimpse into &kate;'s power and
-flexibility.  In this section we'll look at three items:
+menu or use <keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>F</keycap></keycombo>. 
+This menu offers you your first glimpse into &kate;'s power and
+flexibility.  In this section we'll look at four items:
 </para>
 
 <variablelist>
-
+<!--FIXME Show Search and Replace
+Show Projects
+Show Current Project
+Show Documents
+and more depending on the plugins enabled move to mdi docbook?
+-->
 <!--changed in 4.2 ???
 contextmenu Behaviour with Make Persistent, + Move To with Right / Top / Left Sidebar
 this is in mdi.docbook
@@ -283,15 +295,6 @@ down. Drag the window into &kate;'s editing window and release the
 prefer.-->
 </para>
 
-<!--no longer in kate 3.10/kde 4.10
-<tip>
-<para>
-If you have grabbed the two parallel lines successfully your mouse
-pointer will turn into two crossed arrows as you drag.
-</para>
-</tip>
--->
-
 </listitem>
 </varlistentry>
 
@@ -328,7 +331,7 @@ application.
 
 <para>
 Many of &kate;'s keystroke commands (shortcuts) are configurable by
-way of the <link linkend="settings">Settings</link> menu.  By default
+way of the <link linkend="settings-help-menu">Settings</link> menu.  By default
 &kate; honors the following key bindings.
 </para>
 
@@ -413,11 +416,11 @@ characters at the beginning of each new line with comments.</para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></para></entry>
-<entry><para><link linkend="find"> Find</link></para></entry>
+<entry><para><link linkend="edit-find"> Find</link></para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul"><keycap>F3</keycap></keycombo></para></entry>
-<entry><para><link linkend="find-again"> Find again</link></para></entry>
+<entry><para><link linkend="edit-find-next"> Find Next</link></para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></para></entry>
@@ -430,11 +433,11 @@ characters at the beginning of each new line with comments.</para></entry>
 
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></para></entry>
-<entry><para> <link linkend="new">New</link> document</para></entry>
+<entry><para> <link linkend="file-new">New</link> document</para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></para></entry>
-<entry><para><link linkend="print">Print</link> </para></entry>
+<entry><para><link linkend="file-print">Print</link> </para></entry>
 </row>
 <row>
 
@@ -443,7 +446,7 @@ characters at the beginning of each new line with comments.</para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></para></entry>
-<entry><para><link linkend="replace"> Replace</link></para></entry>
+<entry><para><link linkend="edit-replace"> Replace</link></para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></para></entry>
@@ -460,11 +463,11 @@ characters at the beginning of each new line with comments.</para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></para></entry>
-<entry><para><link linkend="undo">Undo</link></para></entry>
+<entry><para><link linkend="edit-undo">Undo</link></para></entry>
 </row>
 <row>
 <entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></para></entry>
-<entry><para><link linkend="redo">Redo</link></para></entry>
+<entry><para><link linkend="edit-redo">Redo</link></para></entry>
 </row>
 </tbody>
 </tgroup>
@@ -676,28 +679,6 @@ exported to the environment variable <envar>KATE_PID</envar>. When opening files
 from the built in terminal Kate will automatically select the current instance
 if nothing else is indicated on the command line.</para>
 
-<sect2 id="old-behavior">
-<title>Restoring old style &kate; behavior</title>
-
-<para>When you get used to using sessions you will hopefully see that they
-provide a very simple and efficient tool for working in different areas.
-However, if you prefer the old &kate; behavior (one instance opens all files),
-you can easily achieve that by following this simple strategy:
-
-<itemizedlist>
-<listitem><para>Make kate always start with the <option>--use</option>
-parameter by adding that to the command in the application preferences,
-and additionally using a shell alias.</para></listitem>
-<listitem><para>Configure &kate; to load the last used session at startup.</para>
-</listitem>
-<listitem><para>Configure &kate; to save the file list when closing a session.
-</para></listitem>
-<listitem><para>Load the default session once.</para></listitem>
-</itemizedlist>
-</para>
-
-</sect2>
-
 </sect1>
 
 <sect1 id="fundamentals-getting-help">
diff --git a/doc/kate/index.docbook b/doc/kate/index.docbook
index 3aad430..693711a 100644
--- a/doc/kate/index.docbook
+++ b/doc/kate/index.docbook
@@ -45,13 +45,13 @@
 </copyright>
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2015-07-31</date>
-<releaseinfo>Applications 15.12</releaseinfo>
+<date>2016.04.21</date>
+<releaseinfo>Applications 16.04</releaseinfo>
 
 <abstract>
 <para>&kate; is a programmer's text editor for &kde; 4 and above.</para>
 
-<para>This handbook documents &kate; Version 15.12</para>
+<para>This handbook documents &kate; Version 16.04</para>
 </abstract>
 
 <keywordset>
@@ -72,10 +72,7 @@
 </keywordset>
 
 </bookinfo>
-<!-- FIXME
-ckeck http://kate-editor.org/2012/06/30/kate-in-kde-4-9/
-http://kate-editor.org/2012/11/02/using-the-projects-plugin-in-kate/
-  -->
+
 <chapter id="introduction">
 <title>Introduction</title>
 
diff --git a/doc/kate/menus.docbook b/doc/kate/menus.docbook
index 789d9aa..717bddd 100644
--- a/doc/kate/menus.docbook
+++ b/doc/kate/menus.docbook
@@ -1,29 +1,19 @@
-<chapter id="menu-entries">
-<chapterinfo>
-<authorgroup>
-<author><personname><firstname></firstname></personname></author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</chapterinfo>
-<title>Menu Entries</title>
-
-<!--FIXME: use formatting and anchors consistently throughout this docbook-->
+<chapter id="the-menu-entries">
+<title>The Menu Entries</title>
 
 <sect1 id="file-menu">
 <title>The File Menu</title>
 
 <variablelist>
-<varlistentry>
-<term>
-<anchor id="new"/>
-<menuchoice>
+
+<varlistentry id="file-new">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>New</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
 This command <action>starts a new document</action> in the editing
@@ -33,33 +23,26 @@ is named <emphasis>Untitled</emphasis>.
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="open"/>
-<menuchoice>
+<varlistentry id="file-open">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Open...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Displays a standard &kde; <guilabel>Open File</guilabel>
 dialog. Use the file view to select the file you want to open, and
 click on <guibutton>Open</guibutton> to open it.</para>
-
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="open-recent"/>
-<menuchoice>
+<varlistentry id="file-open-recent">
+<term><menuchoice>
 <guimenu>File</guimenu>
 <guisubmenu>Open Recent</guisubmenu>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
 This is a shortcut to open recently saved documents. Clicking on this
@@ -71,9 +54,8 @@ location.
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="file-open-with">
 <term>
-<anchor id="open-with"/>
 <menuchoice>
 <guimenu>File</guimenu>
 <guisubmenu>Open With</guisubmenu>
@@ -91,55 +73,65 @@ to open the active file</action>. Your file will still be open in &kate;.
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="save"/>
-<menuchoice>
+<varlistentry id="file-save">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Save</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
-This command <action>saves your file</action>. Use it often. If the file is
-<emphasis>Untitled</emphasis> then
-<guimenuitem>Save</guimenuitem> becomes
-<guimenuitem>Save As</guimenuitem>.
+This saves the current document.  If there has already been a save of
+the document then this will overwrite the previously saved file without
+asking for the user's consent.  If it is the first save of a new
+document the save as dialog (described below) will be invoked.
 </para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="save-as"/>
-<menuchoice>
+<varlistentry id="file-save-as">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo>
+</shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Save As...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
-<action>Name and rename files</action> with this command.
-It launches the save file dialog box. This dialog works just as
-the open file dialog box does. You can use it to navigate through
-your file system, preview existing files, or filter your file
-view with file masks.
+This allows a document to be saved with a new file name. This is done by
+means of the file dialog box described above in the <link
+linkend="file-open">Open</link> section of this help file.
 </para>
+</listitem>
+</varlistentry>
 
+<varlistentry id="file-save-as-encoding">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Save As with Encoding</guimenuitem>
+</menuchoice>
+</term><listitem>
 <para>
-Type the name you want to give the file you are saving in the
-Location combo box and press the
-<guibutton>OK</guibutton> button.
-</para>
+Save a document with a new file name in a different encoding.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="file-save-copy-as">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Save Copy As</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>
+Save a copy of the document with a new file name and continue editing the original document.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="file-save-all">
 <term>
-<anchor id="save-all"/>
 <menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo>
@@ -155,29 +147,24 @@ This command <action>saves all modified open files</action>.
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="reload"/>
-<menuchoice>
+<varlistentry id="file-reload">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul"><keycap>F5</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Reload</guimenuitem>
 </menuchoice>
-</term>
-<listitem>
+</term><listitem>
 <para>
-<action>Reloads the active file</action>.  This command is
-useful if another program or process has changed the file while you have
-it open in &kate;
+Reloads the active file from disk. This command is useful if another program or
+process has changed the file while you have it open in &kappname;.
 </para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="file-reload-all">
 <term>
-<anchor id="reload-all"/>
 <menuchoice>
 <guimenu>File</guimenu>
 <guimenuitem>Reload All</guimenuitem>
@@ -190,50 +177,43 @@ it open in &kate;
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="print"/>
-<menuchoice>
+<varlistentry id="file-print">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Print...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
-<action>Print the active file</action>.
+Opens a simple print dialog allowing the user to specify what, where,
+and how to print.
 </para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="export-as-html"/>
-<menuchoice>
+<!--FIXME Print Preview -->
+
+<varlistentry id="file-export-as-html">
+<term><menuchoice>
 <guimenu>File</guimenu>
-<guimenuitem>Export as &HTML;...</guimenuitem>
-</menuchoice>
-</term>
+<guimenuitem>Export as HTML</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>Save the currently open document as an &HTML; file, which will be
 formatted using the current syntax highlighting and color scheme settings.</para>
-<para>This menu item is displayed by the Exporter editor component extension,
-which is enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="close">
-<menuchoice>
+<varlistentry id="file-close">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Close</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
 Close the active file with this command. If you have made unsaved changes, you
@@ -242,9 +222,8 @@ will be prompted to save the file before &kate; closes it.
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="file-close-other">
 <term>
-<anchor id="close-other"/>
 <menuchoice>
 <guimenu>File</guimenu>
 <guimenuitem>Close Other</guimenuitem>
@@ -257,9 +236,8 @@ Close other open documents.
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="file-close-all">
 <term>
-<anchor id="close-all"/>
 <menuchoice>
 <guimenu>File</guimenu>
 <guimenuitem>Close All</guimenuitem>
@@ -273,9 +251,8 @@ in &kate;.
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="file-close-orphaned">
 <term>
-<anchor id="close-orphaned"/>
 <menuchoice>
 <guimenu>File</guimenu>
 <guimenuitem>Close Orphaned</guimenuitem>
@@ -288,50 +265,37 @@ not be reopened during startup, because they are not accessible anymore.
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="close-except"/>
-<menuchoice>
+<varlistentry id="file-close-except">
+<term><menuchoice>
 <guimenu>File</guimenu>
 <guisubmenu>Close Except</guisubmenu>
-</menuchoice>
-</term>
+</menuchoice> (Close Except/Like plugin)</term>
 <listitem>
 <para><action>Close</action> all documents in the file list, 
 <emphasis>except</emphasis> those which match the path selected from this
 submenu.</para>
-<para>This menu item is displayed by the Close Except/Like plugin, which is
-enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="close-like"/>
-<menuchoice>
+<varlistentry id="file-close-like">
+<term><menuchoice>
 <guimenu>File</guimenu>
 <guisubmenu>Close Like</guisubmenu>
-</menuchoice>
-</term>
+</menuchoice> (Close Except/Like plugin)</term>
 <listitem>
 <para><action>Close</action> all documents in the file list which match the path 
 selected from this submenu.</para>
-<para>This menu item is displayed by the Close Except/Like plugin, which is
-enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="quit"/>
-<menuchoice>
+<varlistentry id="file-quit">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
 </shortcut>
 <guimenu>File</guimenu>
 <guimenuitem>Quit</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
 This command <action>closes &kate;</action> and any files you were
@@ -340,25 +304,24 @@ editing, you will be prompted to save them.
 </para>
 </listitem>
 </varlistentry>
+
 </variablelist>
+
 </sect1>
 
 <sect1 id="edit-menu">
 <title>The Edit Menu</title>
-<para>The <guimenu>Edit</guimenu> menu contains a host of commands,
-all to work with the currently active document.</para>
 
 <variablelist>
-<title>Menu Entries</title>
-<varlistentry>
-<term>
-<anchor id="edit-undo"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut>
+
+<varlistentry id="edit-undo">
+<term><menuchoice>
+<shortcut><keycombo
+action="simul">&Ctrl;<keycap>Z</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Undo</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Undo the last editing command (typing, copying, cutting etc.)</para>
 <note><para>This may undo several editing commands of the same type, like typing
@@ -366,71 +329,70 @@ in characters.</para></note>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-redo"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut>
+<varlistentry id="edit-redo">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Redo</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Redo the last undo step.</para>
+<para>This will reverse the most recent change (if any) made using Undo</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-cut"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut>
+<varlistentry id="edit-cut">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Cut</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Removes selected text if any, and places a copy of the removed text in the clipboard.</para>
+<para>This command deletes the current selection and places it on the
+clipboard. The clipboard works invisibly and provides a way to
+transfer data between applications.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-copy"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut>
+<varlistentry id="edit-copy">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Copy</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Copies selected text, if any, to the clipboard.</para>
+<para>This copies the currently selected text to the clipboard so that it may
+be pasted elsewhere. The clipboard works invisibly and provides a way to
+transfer data between applications.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-paste" />
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut>
+<varlistentry id="edit-paste">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Paste</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Copies the first item in the clipboard into the editor at cursor position.</para>
+<para>This will insert the first item in the clipboard at the cursor position.
+The clipboard works invisibly and provides a way to
+transfer data between applications.</para>
 <note><para>If Overwrite Selection is enabled, the pasted text will overwrite the selection, if any.</para></note>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-clipboard-history"/>
-<menuchoice>
+<varlistentry id="edit-clipboard-history">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guisubmenu>Clipboard History</guisubmenu>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>This submenu will display the beginning of portions of text recently
 copied to the clipboard.  Select an item from this menu to paste it in the
@@ -438,90 +400,84 @@ currently open file.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-copy-as-html"/>
-<menuchoice>
+<varlistentry id="edit-copy-as-html">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
-<guisubmenu>Copy as &HTML;</guisubmenu>
-</menuchoice>
-</term>
+<guimenuitem>Copy as HTML</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>Copy the selection as &HTML;, formatted using the current syntax
 highlighting and color scheme settings.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-select-all"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut>
+<varlistentry id="edit-select-all">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Select All</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Selects all text in the editor.</para>
+<para>This will select the entire document. This could be very useful for
+copying the entire file to another application.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-deselect"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></shortcut>
+<varlistentry id="edit-deselect">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Deselect</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Deselects the selected text in the editor if any.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-toggle-block-selection"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Shift;
-<keycap>B</keycap></keycombo></shortcut>
+<varlistentry id="edit-toggle-block-selection">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Block Selection Mode</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Toggles Selection Mode. When the Selection Mode is <quote>BLOCK</quote>, you can make vertical selections,
-⪚ select column 5 to 10 in lines 9 to 15.</para>
-<para>The status bar shows the current state of the Selection Mode, either <quote>LINE</quote> or <quote>BLOCK</quote>.</para>
+<para>Toggles Selection Mode. When the Selection Mode is <guilabel>BLOCK</guilabel>,
+you can make vertical selections, ⪚ select column 5 to 10 in lines 9 to 15.
+The status bar shows the current state of the Selection Mode, either <guilabel>BLOCK</guilabel> or
+<guilabel>LINE</guilabel>.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="vi-input-mode"/><menuchoice>
-<shortcut>
-<keycombo action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo>
-</shortcut>
-<guimenu>Edit</guimenu><guimenuitem>VI input
-Mode</guimenuitem></menuchoice></term>
+<varlistentry id="edit-input-modes">
+<term><menuchoice>
+<guimenu>Edit</guimenu>
+<guimenuitem>Input Modes</guimenuitem>
+</menuchoice></term>
 <listitem>
-<para>Switch to a vi-like, modal editing mode. This mode supports the most used commands
-and motions from vim's normal and visual mode and has an optional vi mode status bar.
+<para>Switch between a normal and a vi-like, modal editing mode. The vi input mode supports the most used commands
+and motions from vim's normal and visual mode and has an optional vi mode statusbar.
 This status bar shows commands while they are being entered, output from commands and
-the current mode.The behavior of this mode can be configured in the
+the current mode. The behavior of this mode can be configured in the
 <ulink url="help:/katepart/config-dialog-editor.html#pref-edit-vi-input-mode">Vi
 Input Mode</ulink> section of the <guilabel>Editing</guilabel> page in 
 &kappname;'s settings dialog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="overwrite-mode"/><menuchoice>
+<varlistentry id="edit-overwrite-mode">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul"><keycap>Ins</keycap></keycombo>
 </shortcut>
-<guimenu>Edit</guimenu><guimenuitem>Overwrite
-Mode</guimenuitem></menuchoice></term>
+<guimenu>Edit</guimenu>
+<guimenuitem>Overwrite Mode</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>Toggles the Insert/Overwrite modes. When the mode is <guilabel>INS</guilabel>, you
 insert characters where the cursor is. When the mode is <guilabel>OVR</guilabel>, writing
@@ -531,109 +487,220 @@ Mode, either <guilabel>INS</guilabel> or <guilabel>OVR</guilabel>.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-find"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
+<varlistentry id="edit-find">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Find...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Launch the incremental search bar to allow you to search for text in the edited document.</para>
+<para>This opens the incremental search bar at the bottom of the editor window.
+On the left side of the bar is a button with an icon to close the bar, followed by a small text
+box for entering the search pattern.</para>
+<para>When you start entering characters of your search pattern, the search starts
+immediately. If there is a match in the text this is highlighted and the background color
+of the entry field changes to light green. If the search pattern does not match any
+string in the text, this is indicated by a light red background color of the entry field.</para>
+<para>Use the 
+<inlinemediaobject><imageobject><imagedata fileref="arrow-up-double-22.png" format="PNG"/></imageobject></inlinemediaobject> or 
+<inlinemediaobject><imageobject><imagedata fileref="arrow-down-double-22.png" format="PNG"/></imageobject></inlinemediaobject> button
+to jump to the next or previous match in the document.</para>
+<para>You can choose whether the search should be case sensitive.
+Selecting <inlinemediaobject><imageobject><imagedata fileref="format-text-superscript-22.png" format="PNG"/></imageobject></inlinemediaobject> 
+will limit finds to entries that match the
+case (upper or lower) of each of the characters in the search  pattern.
+</para>
+<para>Click on the <inlinemediaobject><imageobject><imagedata fileref="configure-shortcuts-22.png" format="PNG"/></imageobject></inlinemediaobject> 
+button at the right side of the incremental search bar to
+switch to the power search and replace bar.
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-find-next"/>
-<menuchoice>
-<shortcut><keycombo action="simul"><keycap>F3</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu><guisubmenu>Find Variants</guisubmenu>
+<varlistentry id="edit-find-next">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>F3</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guisubmenu>Find Variants</guisubmenu>
 <guimenuitem>Find Next</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
  <listitem>
-<para>Go to the nearest downwards match of the last text or regular expression searched for, starting from cursor position</para>
+<para>This repeats the last find operation, if any, without calling the incremental
+search bar, and searching forwards through the document starting from the cursor position.
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-find-previous"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu><guisubmenu>Find Variants</guisubmenu>
+<varlistentry id="edit-find-previous">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Shift;<keycap>F3</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guisubmenu>Find Variants</guisubmenu>
 <guimenuitem>Find Previous</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Go to the nearest upwards match of the last text or regular expression searched for, starting from cursor position</para>
+<para>
+This repeats the last find operation, if any, without calling the incremental
+search bar, and searching backwards instead of forwards through the
+document.
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="find-selected">
-<menuchoice>
-<shortcut><keycombo
-action="simul">&Ctrl;<keycap>H</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu><guisubmenu>Find Variants</guisubmenu>
-<guimenuitem>Find Selected</guimenuitem></menuchoice></term>
+<varlistentry id="edit-find-selected">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guisubmenu>Find Variants</guisubmenu>
+<guimenuitem>Find Selected</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>Finds next occurrence of selected text.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="find-selected-backwards">
-<menuchoice>
-<shortcut><keycombo
-action="simul">&Ctrl;&Shift;<keycap>H</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu><guisubmenu>Find Variants</guisubmenu>
-<guimenuitem>Find Selected Backwards</guimenuitem></menuchoice></term>
+<varlistentry id="edit-find-selected-backwards">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>H</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guisubmenu>Find Variants</guisubmenu>
+<guimenuitem>Find Selected Backwards</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>Finds previous occurrence of selected text.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-replace"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut>
+<varlistentry id="edit-replace">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Replace...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Launch the power search and replace bar to replace one or more instances of a defined text with something else.</para>
+<para>This command opens the power search and replace bar.
+On the upper left side of the bar is a button with an icon to close the bar, followed by a small text
+box for entering the search pattern.</para>
+<para>You can control the search mode by selecting <guilabel>Plain text</guilabel>,
+<guilabel>Whole words</guilabel>, <guilabel>Escape sequences</guilabel> or
+<guilabel>Regular expression</guilabel> from the drop down box.
+</para>
+<!--FIXME not in kf5?
+<para>If <guilabel>Escape sequences</guilabel> or <guilabel>Regular expression</guilabel> are
+selected, the <guibutton>Add...</guibutton> menuitem at the bottom of the context menu of the text boxes will be enabled
+and allows you to add escape sequences or regular expression items to the
+search or replace pattern from predefined lists.</para>
+-->
+<para>Use the 
+<inlinemediaobject><imageobject><imagedata fileref="arrow-up-double-22.png" format="PNG"/></imageobject></inlinemediaobject> or 
+<inlinemediaobject><imageobject><imagedata fileref="arrow-down-double-22.png" format="PNG"/></imageobject></inlinemediaobject> button
+to jump to the next or previous match in the document.</para>
+<para>Enter the text to replace with in the text box labeled <guilabel>Replace</guilabel>
+and click the <guibutton>Replace</guibutton> button to replace only the highlighted text or
+the <guibutton>Replace All</guibutton> button to replace the search text in the whole document.
+</para>
+<para>You can modify the search and replace behavior by selecting different
+options at the bottom of the bar.
+Selecting <inlinemediaobject><imageobject><imagedata fileref="format-text-superscript-22.png" format="PNG"/></imageobject></inlinemediaobject>
+will limit finds to entries that match the
+case (upper or lower) of each of the characters in the search  pattern.
+<inlinemediaobject><imageobject><imagedata fileref="edit-select-all-22.png" format="PNG"/></imageobject></inlinemediaobject>
+will search and replace within the current selection only.
+The <guilabel>Find All</guilabel> button highlights all matches in the document and shows the
+number of found matches in a small popup.
+</para>
+<para>Click on the <inlinemediaobject><imageobject><imagedata fileref="configure-shortcuts-22.png" format="PNG"/></imageobject></inlinemediaobject>
+button at the right side of the power search and replace bar to
+switch to the incremental search bar.
+</para>
+</listitem>
+</varlistentry> 
+
+<varlistentry id="edit-go-to-matching-bracket">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>6</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Move to Matching Bracket</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>Move the cursor to the associated opening or closing bracket.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="edit-select-to-matching-bracket">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>6</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Select to Matching Bracket</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>Selects the text between associated opening and closing brackets.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="edit-go-to-previous-modified-line">
+<term><menuchoice>
+<guimenu>Edit</guimenu>
+<guimenuitem>Move to Previous Modified Line</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>Lines that were changed since opening the file are called modified lines. This action jumps the previous modified line.
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="edit-go-to-next-modified-line">
+<term><menuchoice>
+<guimenu>Edit</guimenu>
+<guimenuitem>Move to Next Modified Line</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>Lines that were changed since opening the file are called modified lines. This action jumps the next modified line.
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-go-to-line"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo></shortcut>
+<varlistentry id="edit-edit-go-to-line">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>G</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Go to Line...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Launches the Go To Line bar, allowing you to enter the number of a line to find in
-the document</para>
+<para>
+This opens the goto line bar at the bottom of the window which is used to have the cursor
+jump to a particular line (specified by number) in the document.  The
+line number may be entered directly into the text box or graphically by
+clicking on the up or down arrow spin controls at the side of the text
+box. The little up arrow will increase the line number and the down
+arrow decrease it. Close the bar with a click on the button with an icon on the left side of the bar.
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-search-in-files"/>
-<menuchoice>
+<varlistentry id="edit-search-in-files">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Search in Files</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Launches the Search and Replace tool view.  This provides more advanced
 functionality than the
@@ -647,14 +714,11 @@ enabled by default.  For more information, see
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-go-to-next-match"/>
-<menuchoice>
+<varlistentry id="edit-go-to-next-match">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Go to Next Match</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Go to the next match in a search performed by the Search and Replace
 plugin.  To go to the next match in a single file search initiated by the
@@ -665,14 +729,11 @@ enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="edit-go-to-previous-match"/>
-<menuchoice>
+<varlistentry id="edit-go-to-previous-match">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Go to Previous Match</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Go to the previous match in a search performed by the Search and Replace
 plugin.  To go to the previous match in a single file search initiated by the
@@ -683,28 +744,21 @@ plugin.  To go to the previous match in a single file search initiated by the
 enabled by default.</para>
 </listitem>
 </varlistentry>
-
 </variablelist>
 
 </sect1>
 
 <sect1 id="view-menu">
-<title>The View Menu</title>
 
-<para>The <guimenu>View</guimenu> menu allows you to manage settings
-specific to the active editor, and to manage frames.</para>
+<title>The View Menu</title>
 
 <variablelist>
-<title>Menu Items</title>
 
-<varlistentry>
-<term>
-<anchor id="view-new"/>
-<menuchoice>
+<varlistentry id="view-new-window">
+<term><menuchoice>
 <guimenu>View</guimenu>
 <guimenuitem>New Window</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>
 <action>Opens another instance of &kate;</action>.
@@ -713,56 +767,76 @@ The new instance will be identical to your previous instance.
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-back"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Alt;<keysym>Left</keysym></keycombo></shortcut>
+<varlistentry id="view-document-previous"><!--documents plugin-->
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keysym>Up</keysym></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
 <guimenuitem>Previous Document</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Opens the document displayed above the currently open document in the Documents list.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-forward"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Alt;<keysym>Right</keysym></keycombo></shortcut>
+<varlistentry id="view-document-next"><!--documents plugin-->
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keysym>Down</keysym></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
 <guimenuitem>Next Document</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Opens the document displayed below the currently open document in the Documents list.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-active"/>
-<menuchoice>
+<varlistentry id="view-active"><!--documents plugin-->
+<term><menuchoice>
 <guimenu>View</guimenu>
 <guimenuitem>Show Active</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Displays the currently open document in the Documents list.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-quick-open"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>O</keycap></keycombo></shortcut>
+<varlistentry id="view-next-tab">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keysym>Right</keysym></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Next Tab</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>Activates the next tab in the tabbar.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="view-previous-tab">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keysym>Left</keysym></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Previous Tab</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>Activates the previous tab in the tabbar.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="view-quick-open">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Alt;<keycap>O</keycap></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
 <guimenuitem>Quick Open</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Show a search field and a list of opened files in the editor area.
 While entering text in the search
@@ -775,39 +849,38 @@ documents easier, if there are a lot of them open.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-split-previous"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Shift;<keycap>F8</keycap></keycombo></shortcut>
-<guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
+<varlistentry id="view-split-previous">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Shift;<keycap>F8</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Split View</guisubmenu>
 <guimenuitem>Previous Split View</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Focus the previous document view, if you have split the editor
 area in more views.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-split-next"/>
-<menuchoice>
-<shortcut><keycap>F8</keycap></shortcut>
-<guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
+<varlistentry id="view-split-next">
+<term><menuchoice>
+<shortcut>
+<keycap>F8</keycap>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Split View</guisubmenu>
 <guimenuitem>Next Split View</guimenuitem>
 </menuchoice>
-</term>
-<listitem>
+</term><listitem>
 <para>Focus the next document view, if you have split the editor
 area in more views.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-split-vertical">
 <term>
-<anchor id="view-split-vertical"/>
 <menuchoice>
 <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>L</keycap></keycombo></shortcut>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
@@ -822,9 +895,8 @@ same document as the old one.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-split-horizontal">
 <term>
-<anchor id="view-split-horizontal"/>
 <menuchoice>
 <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
@@ -839,9 +911,10 @@ the old one.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<!--FIXME Toggle Orientation -->
+
+<varlistentry id="view-close-current">
 <term>
-<anchor id="view-close-current"/>
 <menuchoice>
 <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>R</keycap></keycombo></shortcut>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
@@ -859,9 +932,8 @@ the File List.</para> <para>See also <link linkend="kate-mdi">Working with the
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-close-inactive">
 <term>
-<anchor id="view-close-inactive"/>
 <menuchoice>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
 <guimenuitem>Close Inactive Views</guimenuitem>
@@ -876,9 +948,20 @@ as well as in the File List.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-hide-inactive">
+<term>
+<menuchoice>
+<guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
+<guimenuitem>Hide Inactive Views</guimenuitem>
+</menuchoice>
+</term>
+<listitem>
+<para>This hides all split views except the currently active one.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry id="view-move-splitter-left">
 <term>
-<anchor id="view-move-splitter-left"/>
 <menuchoice>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
 <guimenuitem>Move Splitter Left</guimenuitem>
@@ -890,9 +973,8 @@ vertically split documents further left.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-move-splitter-right">
 <term>
-<anchor id="view-move-splitter-right"/>
 <menuchoice>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
 <guimenuitem>Move Splitter Right</guimenuitem>
@@ -904,9 +986,8 @@ vertically split documents further right.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-move-splitter-up">
 <term>
-<anchor id="view-move-splitter-up"/>
 <menuchoice>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
 <guimenuitem>Move Splitter Up</guimenuitem>
@@ -918,9 +999,8 @@ horizontally split documents further up.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-move-splitter-down">
 <term>
-<anchor id="view-move-splitter-down"/>
 <menuchoice>
 <guimenu>View</guimenu><guisubmenu>Split View</guisubmenu>
 <guimenuitem>Move Splitter Down</guimenuitem>
@@ -933,12 +1013,14 @@ horizontally split documents further down.</para>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice><guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Tool Views</guisubmenu>
 </menuchoice></term>
 <listitem>
 <variablelist>
-<varlistentry>
-<term><anchor id="view-toolviews-show-sidebars"/>
+<varlistentry id="view-toolviews-show-sidebars">
+<term>
 <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Alt;&Shift;<keycap>F</keycap>
 </keycombo></shortcut><guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Sidebars</guimenuitem></menuchoice></term>
@@ -948,27 +1030,23 @@ is visible will stay visible, and if you assigned shortcuts to the
 commands below those will of course continue to work.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-toolviews-show-filelist"/>
-<menuchoice>
-<guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
+<varlistentry id="view-toolviews-show-filelist">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Documents</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice> (Documents plugin)</term>
 <listitem>
 <para>Toggle the display of &kate;'s Documents list</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-toolviews-show-search-and-replace"/>
-<menuchoice>
-<guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
+<varlistentry id="view-toolviews-show-search-and-replace">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Search and Replace</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice> (Documents plugin)</term>
 <listitem>
 <para>Displays the advanced Search and Replace tool view, which supports
 searching through multiple files.  For more information, see 
@@ -978,14 +1056,12 @@ enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-toolviews-show-projects"/>
-<menuchoice>
-<guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
+<varlistentry id="view-toolviews-show-projects">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Projects</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice> (Project plugin)</term>
 <listitem>
 <para>Displays the Projects sidebar, which allows you to view a list of open
 projects and a list of files in those projects.</para>
@@ -994,14 +1070,12 @@ enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-toolviews-show-current-project"/>
-<menuchoice>
-<guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
+<varlistentry id="view-toolviews-show-current-project">    
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Current Project</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice> (Project plugin)</term>
 <listitem>
 <para>Displays the Current Project tool view, which allows you to access details
 about the code contained within the currently open project.</para>
@@ -1014,9 +1088,13 @@ enabled by default.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><shortcut><keycap>F7</keycap></shortcut>
-<guimenu>View</guimenu><guimenuitem>Switch to Command Line</guimenuitem>
+<varlistentry id="view-command-line">
+<term><menuchoice>
+<shortcut>
+<keycap>F7</keycap>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Switch to Command Line</guimenuitem>
 </menuchoice></term>
 <listitem><para>This command will toggle the display of the
 <ulink url="help:/katepart/advanced-editing-tools-commandline.html">built-in 
@@ -1024,18 +1102,32 @@ command line</ulink>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-enlarge-font">
 <term><menuchoice>
-<guimenu>View</guimenu><guimenuitem>Show the Javascript Console</guimenuitem>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Enlarge Font</guimenuitem>
 </menuchoice></term>
-<listitem><para>This opens a tool view that allows you to run Javascript code
-interactively. For more information, see
-<link linkend="dev-scripting">Extending &kate; with Scripts</link>.
-</para></listitem>
+<listitem><para>This increases the display font size.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><guimenu>View</guimenu><guisubmenu>Schema</guisubmenu>
+<varlistentry id="view-shrink-font">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Shrink Font</guimenuitem>
+</menuchoice></term>
+<listitem><para>This decreases the display font size.</para></listitem>
+</varlistentry>
+
+<varlistentry id="view-schema">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Schema</guisubmenu>
 </menuchoice></term>
 <listitem><para>This menu lists the available color schemes. You can change the 
 schema for the current view here, to change the default schema you need to
@@ -1044,33 +1136,40 @@ use the <ulink url="help:/katepart/config-dialog-editor.html#prefcolors">Fonts
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><shortcut><keycombo action="simul"><keycap>F10</keycap>
-</keycombo></shortcut>
-<guimenu>View</guimenu><guimenuitem>Dynamic Word Wrap</guimenuitem></menuchoice>
-</term>
+<varlistentry id="view-dynamic-word-wrap">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>F10</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Word Wrap</guisubmenu>
+<guimenuitem>Dynamic Word Wrap</guimenuitem>
+</menuchoice></term>
 <listitem><para>Toggles dynamic word wrap in the current view. Dynamic word
 wrap makes all the text in a view visible without the need for horizontal
 scrolling by rendering one actual line on more visual lines as needed.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-dynamic-word-wrap-indicators"/>
-<menuchoice>
+<varlistentry id="view-dynamic-word-wrap-indicators">
+<term><menuchoice>
 <guimenu>View</guimenu>
+<guisubmenu>Word Wrap</guisubmenu>
 <guisubmenu>Dynamic Word Wrap Indicators</guisubmenu>
 </menuchoice></term>
-<listitem><para>Choose when and how the dynamic word wrap indicators should be
+<listitem>
+<para>Choose when and how the dynamic word wrap indicators should be
 displayed. This is only available if the <guilabel>Dynamic Word
 Wrap</guilabel> option is checked.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><guimenu>View</guimenu><guimenuitem>Show Static Word
-Wrap Marker</guimenuitem></menuchoice></term>
+<varlistentry id="view-show-statik-word-wrap-markers">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Word Wrap</guisubmenu>
+<guimenuitem>Show Static Word Wrap Marker</guimenuitem>
+</menuchoice></term>
 <listitem><para>Toggles the display of a vertical line indicating the position
 of the wrap width as configured in the
 <ulink url="help:/katepart/config-dialog-editor.html#pref-wrap-words-at">config
@@ -1079,129 +1178,131 @@ dialog</ulink>. This feature requires that you use a true fixed-width font.
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-show-icon-border"/>
-<menuchoice>
-<shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut>
+<varlistentry id="view-show-icon-border">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>F6</keycap></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
+<guisubmenu>Borders</guisubmenu>
 <guimenuitem>Show Icon Border</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>This is a toggle item. Setting it to be checked will make the Icon Border
+<para>This is a toggle item. Setting it on checked will make the Icon Border
 visible in the left side of the active editor, and vice versa. The Icon Border
 indicates the positions of the marked lines in the editor.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="view-show-line-numbers"/>
-<menuchoice>
-<shortcut><keycombo action="simul"><keycap>F11</keycap></keycombo></shortcut>
+<varlistentry id="view-show-line-numbers">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul"><keycap>F11</keycap></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
+<guisubmenu>Borders</guisubmenu>
 <guimenuitem>Show Line Numbers</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>This is a toggle Item. Setting it to be checked will make a pane displaying
-the line numbers of the document visible in the left border of the active editor,
-and vice versa.</para>
+<para>This is a toggle Item. Setting it on checked will make a pane displaying
+the line numbers of the document visible in the left border of the active
+editor, and vice versa.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><guimenu>View</guimenu><guimenuitem>Show Scrollbar
-Marks</guimenuitem></menuchoice></term>
+<varlistentry id="view-scrollbar-marks">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Borders</guisubmenu>
+<guimenuitem>Show Scrollbar Marks</guimenuitem>
+</menuchoice></term>
 <listitem><para>Toggles the visualization of bookmarks (and other marks) on the
 vertical scrollbar. When enabled, a mark is represented by a thin line in the
 mark color at the scrollbar, clicking the &MMB; on the line will scroll the view
 to a position near the mark.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><guimenu>View</guimenu><guimenuitem>Show Scrollbar
-Minimap</guimenuitem></menuchoice></term>
+<varlistentry id="view-border-show-scrollbar-minimap">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Borders</guisubmenu>
+<guimenuitem>Show Scrollbar Mini-Map</guimenuitem>
+</menuchoice></term>
 <listitem><para>This will replace the scrollbar with a visualization of the
 current document. For more information on the scrollbar minimap, see the
 <ulink url="help:/katepart/kate-part-scrollbar-minimap.html">Scrollbar Minimap
 section of the &katepart; Handbook</ulink>.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><shortcut><keycombo action="simul"><keycap>F9</keycap>
-</keycombo></shortcut>
-<guimenu>View</guimenu><guimenuitem>Show Folding Markers</guimenuitem>
-</menuchoice></term>
-<listitem><para>Toggles the display of the folding marker pane in the left
-side of the view. See 
-<ulink url="help:/katepart/advanced-editing-tools-code-folding.html">Using Code 
-Folding</ulink>.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<anchor id="view-code-folding"/>
-<menuchoice>
-<guimenu>View</guimenu><guimenuitem>Code Folding</guimenuitem>
+<varlistentry id="view-code-folding">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Code Folding</guimenuitem>
 </menuchoice></term>
 <listitem><para>These options pertain to
 <ulink url="help:/katepart/advanced-editing-tools-code-folding.html">code 
 folding</ulink>:</para>
 <variablelist>
 
-<varlistentry>
+<varlistentry id="view-show-folding-markers">
 <term><menuchoice>
-<guimenuitem>Fold Current Node</guimenuitem></menuchoice>
-</term>
+<shortcut>
+<keycombo action="simul"><keycap>F9</keycap></keycombo>
+</shortcut>
+<guimenuitem>Show Folding Markers</guimenuitem>
+</menuchoice></term>
+<listitem><para>Toggles the display of the folding marker pane in the left
+side of the view.</para></listitem>
+</varlistentry>
+
+<varlistentry id="view-fold-current-node">
+<term><menuchoice>
+<guimenuitem>Fold Current Node</guimenuitem>
+</menuchoice></term>
 <listitem><para>Collapse the region that contains the cursor.</para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-unfold-current-node">
 <term><menuchoice>
-<guimenuitem>Unfold Current Node</guimenuitem></menuchoice>
-</term>
+<guimenuitem>Unfold Current Node</guimenuitem>
+</menuchoice></term>
 <listitem><para>Expand the region that contains the cursor.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
-&Shift;<keycap>-</keycap></keycombo></shortcut>
-<guimenuitem>Fold Toplevel Nodes</guimenuitem></menuchoice>
-</term>
+
+<varlistentry id="view-fold-toplevel-nodes">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>-</keycap></keycombo>
+</shortcut>
+<guimenuitem>Fold Toplevel Nodes</guimenuitem>
+</menuchoice></term>
 <listitem><para>Collapse all toplevel regions in the document.
 Click on the right pointing triangle to expand all toplevel regions.</para></listitem>
 </varlistentry>
 
-<!--FIXME not implemented in 4.11
-varlistentry>
-<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
-&Shift;<keycap>+</keycap></keycombo></shortcut>
-<guimenuitem>Unfold Toplevel Nodes</guimenuitem></menuchoice>
-</term>
+<!--FIXME not implemented in kf5
+varlistentry id="view-unfold-toplevel-nodes">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>+</keycap></keycombo>
+</shortcut>
+<guimenuitem>Unfold Toplevel Nodes</guimenuitem>
+</menuchoice></term>
 <listitem><para>Expand all toplevel regions in the document.</para></listitem>
-</varlistentry-->
+</varlistentry
+https://git.reviewboard.kde.org/r/127601/
+Dominik Haumann
+I hope this will come back, but noone got around to implement this again... :/
+-->
 </variablelist>
 
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
-<keycap>+</keycap></keycombo></shortcut>
-<guimenu>View</guimenu><guimenuitem>Enlarge Font</guimenuitem></menuchoice>
-</term>
-<listitem><para>This increases the display font size.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;
-<keycap>-</keycap></keycombo></shortcut>
-<guimenu>View</guimenu><guimenuitem>Shrink Font</guimenuitem></menuchoice>
-</term>
-<listitem><para>This decreases the display font size.</para></listitem>
-</varlistentry>
+<!--FIXME
+Show Non-Printable Spaces
+Show Word Count
+-->
 
 </variablelist>
 
@@ -1211,8 +1312,7 @@ varlistentry>
 <title>The Projects Menu</title>
 
 <para>The <guimenu>Projects</guimenu> menu allows you to switch between
-currently open projects.  It is displayed by the Project plugin, which is
-enabled by default.</para>
+currently open projects.  It is displayed by the Project plugin.</para>
 
 <variablelist>
 <title>Menu Items</title>
@@ -1220,29 +1320,27 @@ enabled by default.</para>
 <!--FIXME: these shortcuts conflict with the preexisting Build plugin
             https://bugs.kde.org/show_bug.cgi?id=328170 -->
 
-<varlistentry>
-<term>
-<anchor id="projects-back"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Alt;<keysym>Left</keysym></keycombo></shortcut>
+<varlistentry id="projects-back">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Alt;<keysym>Left</keysym></keycombo>
+</shortcut>
 <guimenu>Projects</guimenu>
 <guimenuitem>Back</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Switch to the previous project.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="projects-forward"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Alt;<keysym>Right</keysym></keycombo></shortcut>
+<varlistentry id="projects-forward">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Alt;<keysym>Right</keysym></keycombo>
+</shortcut>
 <guimenu>Projects</guimenu>
 <guimenuitem>Forward</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Switch to the next project.</para>
 </listitem>
@@ -1255,9 +1353,6 @@ enabled by default.</para>
 <sect1 id="bookmarks-menu">
 <title>The Bookmarks Menu</title>
 
-<para>The <guimenu>Bookmarks</guimenu> menu allows you to work with
-the bookmarks in the currently active document.</para>
-
 <para>Below the entries described here, one entry for each bookmark in
 the active document will be available. The text will be the first few
 words of the marked line. Choose an item to move the cursor to the
@@ -1266,52 +1361,56 @@ line visible.</para>
 
 <variablelist>
 
-<title>Menu Items</title>
-
-<varlistentry>
-<term>
-<anchor id="bookmarks-toggle-bookmark"/>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo></shortcut>
+<varlistentry id="bookmarks-set-bookmark">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>
+</shortcut>
 <guimenu>Bookmarks</guimenu>
 <guimenuitem>Set Bookmark</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Sets or removes a bookmark in the current line of the active document.
 (If it's there, it is removed, otherwise one is set.)</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<anchor id="bookmarks-clear-bookmarks"/>
-<menuchoice>
+<varlistentry id="bookmarks-clear-bookmarks">
+<term><menuchoice>
 <guimenu>Bookmarks</guimenu>
 <guimenuitem>Clear All Bookmarks</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
-<para>Clears (removes) all bookmarks in the active document.</para>
+<para>
+This command will remove all the markers from the document as well as
+the list of markers which is appended at the bottom of this menu item.
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry id="bookmarks-previous">
-<term><menuchoice><shortcut><keycombo action="simul">&Alt;
-<keycap>PgUp</keycap></keycombo></shortcut>
-<guimenu>Bookmarks</guimenu><guimenuitem>Previous</guimenuitem></menuchoice>
-</term>
+<varlistentry id="bookmarks-bookmarks-previous">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>PgUp</keycap></keycombo>
+</shortcut>
+<guimenu>Bookmarks</guimenu>
+<guimenuitem>Previous</guimenuitem>
+</menuchoice></term>
 <listitem><para>This will move the cursor to beginning of the first above line
 with a bookmark. The menuitem text will include the line number and the first
 piece of text on the line. This item is only available when there is a bookmark
 in a line above the cursor.</para></listitem>
 </varlistentry>
 
-<varlistentry id="bookmarks-next">
-<term><menuchoice><shortcut><keycombo action="simul">&Alt;
-<keycap>PgDown</keycap></keycombo></shortcut>
-<guimenu>Bookmarks</guimenu><guimenuitem>Next</guimenuitem></menuchoice></term>
-<listitem><para>This will move the cursor to the beginning of the next line with a
+<varlistentry id="bookmarks-bookmarks-next">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>PgDown</keycap></keycombo>
+</shortcut>
+<guimenu>Bookmarks</guimenu>
+<guimenuitem>Next</guimenuitem>
+</menuchoice></term>
+<listitem><para>This will move the cursor to beginning of the next line with a
 bookmark. The menuitem text will include the line number and the first piece of
 text on the line. This item is only available when there is a bookmark in a line
 below the cursor.</para></listitem>
@@ -1331,43 +1430,55 @@ linkend="fundamentals-using-sessions">Using Sessions</link>.</para>
 <variablelist>
 
 <varlistentry id="sessions-new">
-<term><menuchoice><guimenu>Sessions</guimenu>
-<guimenuitem>New</guimenuitem></menuchoice></term>
+<term><menuchoice>
+<guimenu>Sessions</guimenu>
+<guimenuitem>New</guimenuitem>
+</menuchoice></term>
 <listitem><para>Creates a new empty session. All currently open files will
 be closed.</para></listitem>
 
 </varlistentry>
 
 <varlistentry id="sessions-open">
-<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Open Session...</guimenuitem>
+<term><menuchoice>
+<guimenu>Sessions</guimenu>
+<guimenuitem>Open Session...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Open an existing session. The Session Chooser dialog is
 displayed to let you choose one.</para></listitem>
 </varlistentry>
 
 <varlistentry id="sessions-quick-open">
-<term><menuchoice><guimenu>Sessions</guimenu><guisubmenu>Quick Open Session</guisubmenu>
+<term><menuchoice>
+<guimenu>Sessions</guimenu>
+<guisubmenu>Quick Open Session</guisubmenu>
 </menuchoice></term>
 <listitem><para>This submenu lets you open an existing session.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="sessions-save">
-<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Save Session</guimenuitem>
+<term><menuchoice>
+<guimenu>Sessions</guimenu>
+<guimenuitem>Save Session</guimenuitem>
 </menuchoice></term>
 <listitem><para>Save the current session. If the session is anonymous, you will
 be prompted for a session name.</para></listitem>
 </varlistentry>
 
 <varlistentry id="sessions-save-as">
-<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Save Session
-As...</guimenuitem></menuchoice></term>
+<term><menuchoice>
+<guimenu>Sessions</guimenu>
+<guimenuitem>Save Session As...</guimenuitem>
+</menuchoice></term>
 <listitem><para>Save the current session under a new name. You are prompted for
 a name to use.</para></listitem>
 </varlistentry>
 
 <varlistentry id="sessions-manage">
-<term><menuchoice><guimenu>Sessions</guimenu><guimenuitem>Manage Sessions...</guimenuitem>
+<term><menuchoice>
+<guimenu>Sessions</guimenu>
+<guimenuitem>Manage Sessions...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Displays the Session Manager dialog which allows you to rename
 and delete sessions.</para></listitem>
@@ -1384,88 +1495,92 @@ and delete sessions.</para></listitem>
 
 <variablelist>
 
-<varlistentry>
-<term><anchor id="tools-read-only"/><menuchoice>
+<varlistentry id="tools-read-only">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guimenuitem>Read Only Mode</guimenuitem></menuchoice></term>
- <listitem>
+<guimenuitem>Read Only Mode</guimenuitem>
+</menuchoice></term>
+<listitem>
 <para>Set the current document to Read Only mode. This prevents any text
 addition and any changes in the document formatting.</para>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-filetype"/><menuchoice>
+<varlistentry id="tools-filetype">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guimenuitem>Mode</guimenuitem></menuchoice></term>
- <listitem>
+<guisubmenu>Mode</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>Choose the filetype scheme you prefer for the active document. This
 overwrites the global
 <ulink url="help:/katepart/pref-open-save-modes-filetypes.html">filetype</ulink>
 mode set in <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure
 &kate;...</guimenuitem></menuchoice> in the Filetypes tab for your current
 document only.</para>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-highlighting"/><menuchoice>
+<varlistentry id="tools-highlighting">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guisubmenu>Highlighting</guisubmenu></menuchoice></term>
- <listitem>
+<guisubmenu>Highlighting</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>Choose the Highlighting scheme you prefer for the active document. This
 overwrites the global highlighting mode set in <menuchoice>
-<guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem>
+<guimenu>Settings</guimenu><guimenuitem>Configure Editor...</guimenuitem>
 </menuchoice> for your current document only.</para>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-indentation"/><menuchoice>
+<varlistentry id="tools-indentation">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guisubmenu>Indentation</guisubmenu></menuchoice></term>
- <listitem>
+<guisubmenu>Indentation</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>Choose the <ulink url="help:/katepart/kate-part-autoindent.html">style of
 indentation</ulink> you want for your active document.
 This overwrites the global indentation mode set in <menuchoice>
-<guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem>
+<guimenu>Settings</guimenu><guimenuitem>Configure Editor...</guimenuitem>
 </menuchoice> for your current document only.</para>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-encoding"/><menuchoice>
+<varlistentry id="tools-encoding">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guisubmenu>Encoding</guisubmenu></menuchoice></term>
- <listitem>
+<guisubmenu>Encoding</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>You can overwrite the default encoding set in <menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure
-Editor...</guimenuitem></menuchoice> in the <guilabel>Open/Save</guilabel> page
+<guimenu>Settings</guimenu><guimenuitem>Configure Editor...</guimenuitem>
+</menuchoice> in the <guilabel>Open/Save</guilabel> page
 to set a different encoding for your current document. The encoding you
-set here will be only valid for your current document.
-  <!-- Explain disabled and add link to config page here?-->
-</para>
+set here will be only valid for your current document.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-end-of-line"/><menuchoice>
+<varlistentry id="tools-end-of-line">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guisubmenu>End of Line</guisubmenu></menuchoice></term>
- <listitem>
+<guisubmenu>End of Line</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>Choose your preferred end of line mode for your active
 document. This overwrites the global end of line mode set in <menuchoice>
-<guimenu>Settings</guimenu> <guimenuitem>Configure Editor...</guimenuitem>
+<guimenu>Settings</guimenu><guimenuitem>Configure Editor...</guimenuitem>
 </menuchoice> for your current document only.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-add-byte-mark-order"/><menuchoice>
+<varlistentry id="tools-add-byte-mark-order">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guisubmenu>Add Byte Mark Order (BOM)</guisubmenu></menuchoice></term>
- <listitem>
+<guisubmenu>Add Byte Mark Order (BOM)</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>Checking this action you can explicitly add a byte order mark for unicode
 encoded documents. The byte order mark (BOM) is a Unicode character used to signal
 the endianness (byte order) of a text file or stream, for more information see
@@ -1473,23 +1588,23 @@ the endianness (byte order) of a text file or stream, for more information see
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-scripts"/><menuchoice>
+<varlistentry id="tools-scripts">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guisubmenu>Scripts</guisubmenu></menuchoice></term>
- <listitem>
+<guisubmenu>Scripts</guisubmenu>
+</menuchoice></term>
+<listitem>
 <para>This submenu contains a list of all scripted actions. The list can easily be
 modified by 
 <ulink url="help:/katepart/dev-scripting.html#dev-scripting-command-line">writing 
 your own scripts</ulink>. This way, &kate; can be extended with user-defined tools.
 </para>
-
 <para><ulink url="help:/katepart/tools.html#scripts">There is a complete list of
 scripts in the &katepart; documentation.</ulink></para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="tools-invoke-code-completition">
 <term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo>
@@ -1502,7 +1617,7 @@ scripts in the &katepart; documentation.</ulink></para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="tools-word-completition">
 <term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Word Completion</guimenuitem>
@@ -1510,19 +1625,20 @@ scripts in the &katepart; documentation.</ulink></para>
 <listitem>
 <para><guimenuitem>Reuse Word Below</guimenuitem> (<keycombo action="simul">&Ctrl;
 <keycap>9</keycap></keycombo>) and <guimenuitem>Reuse Word Above</guimenuitem>
-(<keycombo action="simul">&Ctrl; <keycap>8</keycap></keycombo>) complete
-the currently typed text by searching for similar
+(<keycombo action="simul">&Ctrl; <keycap>8</keycap></keycombo>) complete the
+currently typed text by searching for similar
 words backward or forward from the current cursor position. <guimenuitem>Shell
 Completion</guimenuitem> pops up a completion box with matching entries.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="spelling-automatic-spell-checking">
 <term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo>
 </shortcut>
-<guimenu>Tools</guimenu><guisubmenu>Spelling</guisubmenu>
+<guimenu>Tools</guimenu>
+<guisubmenu>Spelling</guisubmenu>
 <guimenuitem>Automatic Spell Checking</guimenuitem>
 </menuchoice></term>
 <listitem>
@@ -1531,11 +1647,12 @@ is underlined in the document on-the-fly.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-spelling"/><menuchoice>
-<guimenu>Tools</guimenu><guisubmenu>Spelling</guisubmenu><guimenuitem>Spelling...</guimenuitem></menuchoice>
-</term>
-
+<varlistentry id="spelling-spelling">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Spelling</guisubmenu>
+<guimenuitem>Spelling...</guimenuitem>
+</menuchoice></term>
 <listitem><para><action>This initiates the spellchecking program - a program
 designed to help the user catch and correct any spelling errors.</action></para>
 
@@ -1545,42 +1662,52 @@ section of the <emphasis>&kde; Fundamentals</emphasis> documentation</ulink>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-spelling-from-cursor"/><menuchoice>
-<guimenu>Tools</guimenu><guisubmenu>Spelling</guisubmenu>
-<guimenuitem>Spelling (from cursor)...</guimenuitem></menuchoice></term>
- <listitem>
-<para>This initiates the spellchecking program but it starts from where your cursor
+<varlistentry id="tools-spelling-from-cursor">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Spelling</guisubmenu>
+<guimenuitem>Spelling (from cursor)...</guimenuitem>
+</menuchoice></term>
+<listitem>
+<para>This initiates the spellchecking program but it starts where your cursor
 is instead of at the beginning of the document.</para>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-spellcheck-selection"/><menuchoice>
-<guimenu>Tools</guimenu><guisubmenu>Spelling</guisubmenu>
-<guimenuitem>Spellcheck Selection...</guimenuitem></menuchoice></term>
- <listitem>
+<varlistentry id="tools-spellcheck-selection">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Spelling</guisubmenu>
+<guimenuitem>Spellcheck Selection...</guimenuitem>
+</menuchoice></term>
+<listitem>
 <para>Spellchecks the current selection.</para>
- </listitem>
+</listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-change-dictionary"/><menuchoice>
-<guimenu>Tools</guimenu><guisubmenu>Spelling</guisubmenu>
-<guimenuitem>Change Dictionary</guimenuitem></menuchoice></term>
- <listitem>
+<varlistentry id="tools-change-dictionary">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Spelling</guisubmenu>
+<guimenuitem>Change Dictionary</guimenuitem>
+</menuchoice></term>
+<listitem>
 <para>Displays a drop down box with all available dictionaries for spellchecking
 at the bottom of the editor window. This allows easy switching of the spellcheck
-dictionary ⪚ for automatic spellchecking of text in different languages.</para>
- </listitem>
+dictionary ⪚ for automatic spellcheck of text in different languages.</para>
+</listitem>
 </varlistentry>
-<!-- Indent/Unindent no longer in the menu in 4.11???, but shortcuts work
-<varlistentry>
-<term><anchor id="indent"/><menuchoice>
+
+<!-- Indent/Unindent no longer in the menu ???, but shortcuts work-->
+<!--
+<varlistentry id="tools-indent">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo>
 </shortcut>
-<guimenu>Tools</guimenu><guimenuitem>Indent</guimenuitem></menuchoice></term>
+<guimenu>Tools</guimenu>
+<guimenuitem>Indent</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>This increases the paragraph's indentation by one step. The size of the
 step depends on the <link linkend="pref-edit-indent"> indentation
@@ -1588,30 +1715,34 @@ settings</link>.</para>
 </listitem>
 </varlistentry>
 
- <varlistentry>
-<term><anchor id="tools-unindent"/><menuchoice>
+<varlistentry id="tools-unindent">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;&Shift;<keycap>I</keycap></keycombo>
 </shortcut>
-<guimenu>Tools</guimenu><guimenuitem>Unindent</guimenuitem></menuchoice></term>
+<guimenu>Tools</guimenu>
+<guimenuitem>Unindent</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>This reduces the paragraph's indentation by one step. The size of the step
 depends on the <link linkend="pref-edit-indent"> indentation settings</link>.</para>
 </listitem>
 </varlistentry>
 -->
-<varlistentry>
-<term><anchor id="tools-cleanindent"/><menuchoice>
-<guimenu>Tools</guimenu><guimenuitem>Clean
-Indentation</guimenuitem></menuchoice></term>  <listitem>
+<varlistentry id="tools-cleanindent">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guimenuitem>Clean Indentation</guimenuitem>
+</menuchoice></term>
+<listitem>
 <para>This cleans the indentation for the current selection or for the
 line the cursor is currently in. Cleaning the indentation ensures that
 all your selected text follows the indentation mode you choose.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-align"/><menuchoice>
+<varlistentry id="tools-align">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Align</guimenuitem>
 </menuchoice></term>
@@ -1621,8 +1752,8 @@ indentation mode and indentation settings in the document.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-comment"/><menuchoice>
+<varlistentry id="tools-comment">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo>
 </shortcut>
@@ -1635,8 +1766,8 @@ selected lines.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-uncomment"/><menuchoice>
+<varlistentry id="tools-uncomment">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo>
 </shortcut>
@@ -1648,8 +1779,8 @@ line where the text cursor is located or from the beginning of any
 selected lines.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-uppercase"/><menuchoice>
+<varlistentry id="tools-uppercase">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo>
 </shortcut>
@@ -1660,8 +1791,8 @@ selected lines.</para></listitem>
 uppercase.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-lowercase"/><menuchoice>
+<varlistentry id="tools-lowercase">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;&Shift;<keycap>U</keycap></keycombo>
 </shortcut>
@@ -1672,10 +1803,10 @@ uppercase.</para></listitem>
 lowercase.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-capitalize"/><menuchoice>
+<varlistentry id="tools-capitalize">
+<term><menuchoice>
 <shortcut>
-<keycombo action="simul">&Alt;&Ctrl;<keycap>U</keycap></keycombo>
+<keycombo action="simul">&Ctrl;&Alt;<keycap>U</keycap></keycombo>
 </shortcut>
 <guimenu>Tools</guimenu>
 <guimenuitem>Capitalize</guimenuitem>
@@ -1684,8 +1815,8 @@ lowercase.</para></listitem>
 word.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-join-lines"/><menuchoice>
+<varlistentry id="tools-join-lines">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo>
 </shortcut>
@@ -1697,8 +1828,8 @@ with one white space character as a separator. Leading/trailing white space on
 joined lines is removed in the affected ends.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-word-wrap-document"/><menuchoice>
+<varlistentry id="tools-word-wrap-document">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Apply Word Wrap</guimenuitem>
 </menuchoice></term>
@@ -1710,8 +1841,8 @@ in the Editing tab in <menuchoice>
 Editor...</guimenuitem></menuchoice></para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-create-snippet"/><menuchoice>
+<varlistentry id="tools-create-snippet"><!--snippet plugin-->
+<term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Create Snippet</guimenuitem>
 </menuchoice></term>
@@ -1721,8 +1852,8 @@ may insert in any part of any document.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-snippets"/><menuchoice>
+<varlistentry id="tools-snippets">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Snippets...</guimenuitem>
 </menuchoice></term>
@@ -1732,131 +1863,17 @@ may insert in any part of any document.</para>
 </varlistentry>
 
 </variablelist>
-<para>Menu items for the selected
-<ulink url="help:/katepart/config-dialog-editor.html#pref-plugins">plugins</ulink>
-are displayed at the end of this menu.
-</para>
-
 </sect1>
 
-<sect1 id="settings-menu">
-
-<title>The Settings Menu</title>
-
-<para>The <guimenu>Settings</guimenu> menu allows you to change the properties
-of the main window, such as showing/hiding toolbars, and provides
-access to the configuration dialogs.</para>
-
-<variablelist>
+<sect1 id="settings-help-menu">
+<title>The Settings and Help Menu</title> 
 
-<varlistentry>
-<term><anchor id="show-toolbar"/><menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Show Toolbar</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
 <para>
-When this is checked, this displays a movable toolbar containing buttons used to
-initiate frequently used commands. When unchecked the toolbar is hidden.
+&kate; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu>
+menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings"
+>Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink>
+of the &kde; Fundamentals.
 </para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><anchor id="show-statusbar"/><menuchoice>
-<guimenu>Settings</guimenu><guimenuitem>Show
-Statusbar</guimenuitem></menuchoice></term>
-<listitem>
-<para>When checked, this displays a small bar at the bottom of the editor
-containing information about the status of the current document.  When unchecked
-the status bar is hidden.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><anchor id="show-path"/><menuchoice>
-<guimenu>Settings</guimenu><guimenuitem>Show
-Path in Titlebar</guimenuitem></menuchoice></term>
-<listitem>
-<para>When selected, this displays in the titlebar the path (its location in the
-file system) of the current document.  When unchecked the path is hidden.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="view-fullscreen">
-<term><menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo>
-</shortcut>
-<guimenu>Settings</guimenu><guimenuitem>Full Screen
-Mode</guimenuitem></menuchoice></term>
-<listitem><para>Toggles full screen display.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<anchor id="settings-configure-shortcuts"/>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure Shortcuts...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Display the familiar &kde; Keyboard Shortcut Configuration
-Dialog.  For more information on using this, see the
-<ulink url="help:/fundamentals/shortcuts.html"><emphasis>Using and Customizing
-Shortcuts</emphasis> section of the <emphasis>&kde; Fundamentals</emphasis>
-documentation</ulink>.</para>
-</listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term>
-<anchor id="settings-configure-toolbars"/>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure Toolbars...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Display the familiar &kde; Toolbar Configuration Dialog.  For more
-information on using this, see the 
-<ulink url="help:/fundamentals/config.html#toolbars"><emphasis>Customizing
-Toolbars</emphasis> section of the <emphasis>&kde; Fundamentals</emphasis>
-documentation</ulink>.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<anchor id="settings-configure-kate"/>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure &kate;...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Launch the <link linkend="config-dialog">Main Configuration Dialog</link></para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect1>
-
-<sect1 id="help-menu">
-
-<title>The Help Menu</title>
-
-<para>Apart from standard &kde; <guimenu>Help</guimenu> menu items
-described below you will have a menu entry to show the <guimenuitem>About
-Editor Component</guimenuitem> information.</para>
-
-&help.menu.documentation;
 
 </sect1>
-
 </chapter>
diff --git a/doc/kate/plugins.docbook b/doc/kate/plugins.docbook
index 605d867..9021614 100644
--- a/doc/kate/plugins.docbook
+++ b/doc/kate/plugins.docbook
@@ -9,10 +9,7 @@
 
 <title>Working with Plugins</title>
 
-<para>&kate; offers several types of plugin.  There are plugins for the &kate; editor
-component, which are available to any application using the editor component, 
-such as KDevelop, Quanta, Kile, &kwrite; and many others.  There are also plugins
-only available in the &kate; editor itself.  There are two types of these plugins:
+<para>&kate; offers several plugins.There are two types of these plugins:
 some are written in native C++, while others are written in the Python programming
 language.  There are subtle differences in these, described below.</para>
 
@@ -21,20 +18,6 @@ linkend="configuring-kate-configdialog">configuration dialog</link>, which also
 provides access to additional configuration options for plugins that require
 it.</para>
 
-<para>There are many plugins for various purposes available
-and you can search the web for more. A few plugins are shipped with the
-editor component, for inserting automatic braces, inserting files,
-and exporting text as &HTML;.</para>
-
-<sect1 id="editor-component-plugins">
-<title>Editor Component Extensions</title>
-
-<para>For information about available plugins, see the 
-<ulink url="help:/katepart/editor-component-plugins.html">Editor Component
-Extensions section of the &katepart; Handbook</ulink>.</para>
-
-</sect1>
-
 <sect1 id="kate-application-plugins">
 <title>&kate; Application Plugins</title>
 
@@ -73,6 +56,9 @@ The available application plugins are:
   File system browser tool view</para>
 </listitem>
 <listitem>
+<para>Documents - Displays the open files in a file tree</para>
+</listitem>
+<listitem>
 <para><link linkend="kate-application-plugin-gdb">&gdb;</link> - Provides a
 simple &gdb; frontend</para>
 </listitem>
@@ -118,24 +104,6 @@ query on SQL databases</para>
 <para><link linkend="kate-application-plugin-xmltools">&XML;Completetion</link> - Lists &XML; elements,
 attributes, attribute values and entities allowed by DTD</para>
 </listitem>
-
-<!-- not in 4.10
-<listitem>
-<para>Text Snippets - Configurable Text Snippets</para>
-</listitem-->
-<!--listitem>
-<para>Kate Python Browser Plugin - A Python browser plugin for Kate</para>
-</listitem-->
-<!--<listitem>
-<para><link linkend="kate-application-plugin-exttools">External Tools</link></para>
-</listitem>
-<listitem>
-<para><link linkend="kate-application-plugin-snippets">Kate Snippets</link> - Snippets plugin with code completion support</para>
-</listitem>
-<para>Tabify - Adds a tab bar to Kate's main window</para>
-http://kate-editor.org/2011/04/25/kates-tab-bar-plugins/
-</listitem>
--->
 </itemizedlist>
 </sect1>
 
@@ -170,7 +138,8 @@ To produce your own meta DTDs, get <command>dtdparse</command> from
 <para>Start &kate; and open the configuration dialog under <menuchoice><guimenu>Settings</guimenu>
 <guimenuitem>Configure &kate;...</guimenuitem></menuchoice>.
 Then select <guilabel>&XML; Completion</guilabel> which will appear
-in the <guilabel>Application</guilabel>/<guilabel>Plugins</guilabel> section and close the dialog. After
+in the <menuchoice><guimenu>Application</guimenu>
+<guimenuitem>Plugins</guimenuitem></menuchoice> page and close the dialog. After
 that, select <menuchoice><guimenu>&XML;</guimenu><guimenuitem>Assign Meta DTD...</guimenuitem></menuchoice>.
 If your document contains no <quote>DOCTYPE</quote> or the doctype is unknown, you will have to
 select a meta DTD from the file system. Otherwise the meta DTD that
@@ -220,7 +189,7 @@ current element if you are inside a tag.</para>
 <title>Features and Limitations</title>
 
 <para>You can test all functions and limitations by loading
-<filename>$KDEDIR/share/apps/katexmltools/testcases.xml</filename>
+<filename>$KDEDIR/share/apps/katexmltools/testcases.xml</filename><!--FIXME replacement for KDEDIRS-->
 into &kate; and following the instructions.</para>
 
 </sect2>
@@ -229,17 +198,15 @@ into &kate; and following the instructions.</para>
 <sect2 id="xmltools-menu">
 <title>Menu Structure</title>
 
-<variablelist>
+<variablelist id="xml-insert-element">
 <varlistentry>
-<term>
-<menuchoice>
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo>
 </shortcut>
 <guimenu>&XML;</guimenu>
 <guimenuitem>Insert Element...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem><para>This will open a dialog that lets you insert an &XML; element.
 The <, > characters and the closing tag will be inserted automatically.
 If you have selected text when this menu item is selected, the selected
@@ -250,29 +217,25 @@ using <guimenuitem>Assign Meta DTD...</guimenuitem>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="xml-close-element">
+<term><menuchoice>
 <shortcut>
 <keycombo action="simul">&Ctrl;<keycap><</keycap></keycombo>
 </shortcut>
 <guimenu>&XML;</guimenu>
 <guimenuitem>Close Element</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem><para>This will search your text for a tag that is not yet closed
 and will close it by inserting the corresponding closing tag.
 The search starts at the cursor position and goes left. If
 it cannot find an open tag nothing will happen.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="xml-assign-metadtd">
+<term><menuchoice>
 <guimenu>&XML;</guimenu>
 <guimenuitem>Assign Meta DTD...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem><para>This will tell the plugin which meta DTD to use for the
 current document. Note that this assignment will not be saved.
 You will have to repeat it when you start &kate; the next time.</para></listitem>
@@ -290,49 +253,6 @@ You will have to repeat it when you start &kate; the next time.</para></listitem
 <para>KDE SC 4 version copyright 2010 Tomáš Trnka</para>
 <para>Documentation copyright 2001,2002 &Daniel.Naber;</para>
 </sect2>
-
-</sect1>
-<!--FIXME this belongs to Extensions, it is an editor plugin-->
-<sect1 id="kate-editor-plugin-exporter">
-<!--<sect1info>
-<authorgroup><author>
-&TC.Hollingsworth; &TC.Hollingsworth.mail;
-</author></authorgroup>
-</sect1info>-->
-<title>Exporter</title>
-
-<sect2 id="exporter-menu">
-<title>Menu Structure</title>
-
-<variablelist>
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>File</guimenu>
-<guimenuitem>Export as &HTML;...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>
-Export your file in &HTML; format so your document can be viewed as a web page.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Edit</guimenu>
-<guimenuitem>Copy as &HTML;...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Copies selected text with the syntax highlight as &HTML; text.</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-</sect2>
 </sect1>
 
 <sect1 id="kate-application-plugin-searchinfiles">
@@ -616,51 +536,43 @@ a particular match by double-clicking on its listing instead of the file name.
 
 <variablelist>
 
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-searchinfiles">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Search in Files</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Launches the Search and Replace tool view.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-next-match">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Go to Next Match</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Go to the next match in a search performed by the Search and Replace
 plugin.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-previous-match">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Go to Previous Match</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Go to the previous match in a search performed by the Search and Replace
 plugin.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="view-toolviews-searchandreplace">
+<term><menuchoice>
 <guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Search and Replace</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Toggle the display of &kappname;'s <guilabel>Search and Replace</guilabel> tool.
 </para>
@@ -673,11 +585,7 @@ plugin.</para>
 </sect1>
 
 <sect1 id="kate-application-plugin-fsbrowser">
-<!--<sect1info>
-<authorgroup><author>
-&TC.Hollingsworth; &TC.Hollingsworth.mail;
-</author></authorgroup>
-</sect1info>-->
+
 <title>Filesystem Browser</title>
 
 <para>The Filesystem Browser is a folder viewer, allowing you to open
@@ -687,14 +595,11 @@ files from a displayed folder in the current frame.</para>
 <title>Menu Structure</title>
 <variablelist>
 
-<varlistentry>
-<term>
-<anchor id="view-toolviews-show-fileselector"/>
-<menuchoice>
+<varlistentry id="view-toolviews-show-filebrowser">
+<term><menuchoice>
 <guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Filesystem Browser</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Toggle the display of &kate;'s Filesystem Browser.</para>
 </listitem>
@@ -844,194 +749,9 @@ list, and order them using the arrow buttons at the side of the list.</para>
 </sect2>
 </sect1>
 
-<!--some material from mdi.docbook needs to be migrated here too-->
-<!--<sect1 id="kate-application-plugin-exttools">
-<sect1info>
-<authorgroup><author>
-&TC.Hollingsworth; &TC.Hollingsworth.mail;
-</author></authorgroup>
-</sect1info>
-<title>External Tools</title>
-
-<para>In the <guimenu>Tools</guimenu> menu you will find a submenu labeled
-<guisubmenu>External Tools</guisubmenu>, if you have enabled them in &kate; settings.
-These tools invoke external applications with data related to the current document,
-for example its URL, directory, text or selection.</para>
-
-<para>External tools are user defined, you can add, edit or remove tools using
-the <link linkend="exttools-config">External Tools</link> configuration panel.
-</para>
-
-<sect2 id="exttools-menu">
-<title>Menu Structure</title>
-<variablelist>
-
-<varlistentry>
-<term><menuchoice><guimenu>Tools</guimenu><guisubmenu>External
-Tools</guisubmenu></menuchoice></term>
-<listitem><para>This submenu contains all the external tools you have
-configured.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</sect2>
-
-<sect2 id="exttools-config">
-<title>Configuration</title>
-
-<para>External tools are configured on the <guilabel>External Tools</guilabel> page
-of <link linkend="configuring-kate-configdialog">&kate;'s configuration</link>. These tools invoke external
-applications with data related to the current document, for example its URL,
-directory, text or selection. This page allows you to manage the menu and edit,
-remove or add new tools.</para>
-
-<para>Each external tool is a shell command which contains macros representing
-the document data. When activated, the macros are substituted with data from the
-active document.</para>
-
-<variablelist>
-<title>Available Commands</title>
-
-<varlistentry>
-<term><guibutton>New</guibutton></term>
-<listitem><para>Add a new external tool to the list.  This will launch the property
-sheet described below where you can configure an external tool.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guibutton>Edit</guibutton></term>
-<listitem><para>Edit the currently selected external tool, using the property
-sheet described below.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guibutton>Insert Separator</guibutton></term>
-<listitem><para>Adds a separator line that appears in the menu below the currently
-selected item.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guibutton>Up Arrow</guibutton></term>
-<listitem><para>Moves the currently selected item above the previous
-one.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guibutton>Down Arrow</guibutton></term>
-<listitem><para>Moves the currently selected item below the subsequent
-one.</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-<variablelist>
-<title>External Tools Properties</title>
-<varlistentry>
-<term><guilabel>Label</guilabel></term>
-<listitem><para>A friendly label that will appear in the <guisubmenu>External Tools</guisubmenu> menu.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guibutton>Icon</guibutton></term>
-<listitem><para>Allows you to select an icon that appears next to the label in the
-<guisubmenu>External Tools</guisubmenu> menu.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Script</guilabel></term>
-<listitem><para>The script to execute when the tool is activated. Before passing
-the script to the shell, the following macros are substituted:
-
-<variablelist>
-<varlistentry>
-<term><userinput>%URL</userinput></term>
-<listitem><para>The full URL of the current document, or an empty string if the
-document is unsaved.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%URLs</userinput></term>
-<listitem><para>A space separated list of the URLs of all open documents
-(except unsaved ones).</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%directory</userinput></term>
-<listitem><para>The directory part of the current documents URL or an empty
-string if the current document is unsaved.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%filename</userinput></term>
-<listitem><para>The filename of the current document without the path, or an
-empty string if the current document is unsaved.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%line</userinput></term>
-<listitem><para>The line number of the insertion cursor is in the current
-document.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%column</userinput></term>
-<listitem><para>The column number of the insertion cursor in the current
-document.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%selection</userinput></term>
-<listitem><para>The selected text in the current document, or an empty string
-if no text is selected</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><userinput>%text</userinput></term>
-<listitem><para>The full text of the current document. Beware that this may
-potentially exceed the maximum command length allowed on your system.
-Use with care.</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Executable</guilabel></term>
-<listitem><para>The main executable in the script. This is mandatory, and is used
-to test if the command can be run at all. A fully qualified path is allowed
-in case the executable is not in your <envar>PATH</envar> variable.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Mime types</guilabel></term>
-<listitem><para>A semicolon separated list of mimetypes for which this command
-should be enabled.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Save</guilabel></term>
-<listitem><para>You can optionally select to have the current or all documents
-saved prior to executing the script. This is handy if your script reads the file
-from disk.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Command line name</guilabel></term>
-<listitem><para>If you fill this, the tool will be available in the
-<link linkend="advanced-editing-tools-commandline">editors command line</link> as
-<command>exttool-<replaceable>Command Line Name</replaceable></command>
-(the string you enter here prepended <quote>exttool-</quote>).</para></listitem>
-</varlistentry>
-
-</variablelist>
-</sect2>
-</sect1>-->
-
  <!--
  FIXME: replaced by built-in functionality in 4.12
-        lots of this is wrong, other parts need to be moved somewhere else
+        lots of this is wrong, other parts need to be moved somewhere else -->
 <sect1 id="kate-application-plugin-snippets">
 <sect1info>
 <authorgroup>
@@ -1086,7 +806,7 @@ repositories.</para>
 <guibutton>Get New Snippets</guibutton> and a window with a list of snippet 
 repositories will open.  After downloading the desired snippet, make sure that
 you have activated it.</para>
-<!- -FIXME no way to load a local file ?- ->
+<!--FIXME no way to load a local file ?-->
 <para>You can also load snippet repositories from a local file using the file
 browser at the bottom of the panel.  Click <guibutton>Copy to repository</guibutton>
 when finished.</para>
@@ -1212,7 +932,7 @@ writing much of this section.</para>
 </sect2>
 
 </sect1>
--->
+
 
 <sect1 id="kate-application-plugin-build">
 <!--http://kate-editor.org/2011/06/21/kate-plugin-updates-part-1/ -->
@@ -1230,14 +950,6 @@ writing much of this section.</para>
 <para>The Build plugin allows you to run actions like build, clean and compile
 on a project.</para>
 
-<!--When you first install Kate, you need to enable the plugin:
-
-Click `Settings → Configure Kate`
-
-In the tree on the left of the screen, click `Plugins`.
-
-In the `Plugin Manager` panel on the right, select `Build plugin`, and then click `OK`.-->
-
 </sect2>
 
 <sect2 id="build-using">
@@ -1331,7 +1043,7 @@ To navigate to the next error, press
 <sect2 id="build-menu">
 <title>Menu Structure</title>
 
-<variablelist>
+<variablelist id="build-build">
 <varlistentry>
 <term><menuchoice>
 <guimenu>Build</guimenu><guimenuitem>Build</guimenuitem>
@@ -1340,7 +1052,7 @@ To navigate to the next error, press
 selected target.</para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="build-clean">
 <term><menuchoice>
 <guimenu>Build</guimenu><guimenuitem>Clean</guimenuitem>
 </menuchoice></term>
@@ -1348,7 +1060,7 @@ selected target.</para></listitem>
 selected target.</para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="build-compile">
 <term><menuchoice>
 <guimenu>Build</guimenu><guimenuitem>Quick Compile</guimenuitem>
 </menuchoice></term>
@@ -1356,7 +1068,7 @@ selected target.</para></listitem>
 currently selected target.</para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="build-previous-error">
 <term><menuchoice>
 <shortcut><keycombo action="simul">&Ctrl;&Alt;<keysym>Left</keysym></keycombo></shortcut>
 <guimenu>Build</guimenu><guimenuitem>Previous Error</guimenuitem>
@@ -1365,7 +1077,7 @@ currently selected target.</para></listitem>
 document.</para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="build-next-error">
 <term><menuchoice>
 <shortcut><keycombo action="simul">&Ctrl;&Alt;<keysym>Right</keysym></keycombo></shortcut>
 <guimenu>Build</guimenu><guimenuitem>Next Error</guimenuitem>
@@ -1375,14 +1087,14 @@ document.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice>
+<term><menuchoice id="build-targets">
 <guimenu>Build</guimenu><guisubmenu>Targets</guisubmenu>
 </menuchoice></term>
 <listitem><para>Select from a list of targets configured by the user.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><menuchoice>
+<term><menuchoice id="build-next-target">
 <guimenu>Build</guimenu><guimenuitem>Next Target</guimenuitem>
 </menuchoice></term>
 <listitem><para>Switch to the next target configured by the user.</para></listitem>
@@ -1424,7 +1136,7 @@ deleting, and requesting information from databases.</para>
 <listitem><para>Display results in a table</para></listitem>
 </itemizedlist>
 
-<!--If Kate is installed on your computer, at first open Kate.
+<!--FIXME If Kate is installed on your computer, at first open Kate.
 If Kate isn't installed on your computer, download and install it.
 
 Using SQL Plugin
@@ -1983,14 +1695,11 @@ which is enabled by default.</para>
 
 <variablelist>
 
-<varlistentry>
-<term>
-<anchor id="view-toolviews-show-konsole"/>
-<menuchoice>
+<varlistentry id="view-toolviews-show-terminal">
+<term><menuchoice>
 <guimenu>View</guimenu><guisubmenu>Tool Views</guisubmenu>
 <guimenuitem>Show Terminal</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Toggles the display of the built-in terminal emulator.</para>
 <para>When activated for the first time, the terminal will be created.</para>
@@ -2004,15 +1713,15 @@ change to the directory of the active document, if it is a local file.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry id="view-toolviews-pipe-to-terminal">
 <term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Pipe to
 Terminal</guimenuitem></menuchoice></term>
 <listitem><para>Feed the currently selected text into the built-in terminal
 emulator. No newline is added after the text.</para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-sync-terminal-document"/><menuchoice>
+<varlistentry id="tools-sync-terminal-document">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Synchronize Terminal with Current Document</guimenuitem></menuchoice></term>
 <listitem>
@@ -2025,10 +1734,11 @@ sync with the current document.  See
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term><anchor id="tools-focus-terminal"/><menuchoice>
+<varlistentry id="tools-focus-terminal">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guimenuitem>Focus/Defocus Terminal</guimenuitem></menuchoice></term>
+<guimenuitem>Focus/Defocus Terminal</guimenuitem>
+</menuchoice></term>
 <listitem>
 <para>Switch the focus from the current document to the terminal and vice versa.
 </para>
@@ -2072,7 +1782,7 @@ so the calling program is aware you have finished editing the file.</para></list
 
 </sect1>
 
-<!--
+<!--FIXME
 Missing (according to config docs)
 Additional pages for enabled plugins:
 Backtrace Browser


More information about the kde-doc-english mailing list