Beautify docbook files

1 files changed, 357 insertions, 1414 deletions

diff --git a/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook b/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
index 2f65ccf5c7f..8a4aba35cc9 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
@@ -1,120 +1,65 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
->	-->
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">	-->
 
 <chapter id="commands">
-<title
->Command reference</title>
+<title>Command reference</title>
 
-<para
->The following keybindings assume you did not change the default settings.</para>
+<para>The following keybindings assume you did not change the default settings.</para>
 
 <sect1 id="knode-mainwindow">
-<title
->The main &knode; window</title>
+<title>The main &knode; window</title>
 
 <sect2>
-<title
->The <guimenu
->File</guimenu
-> menu</title>
+<title>The <guimenu>File</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Saves the selected article in a file.</action>
+<action>Saves the selected article in a file.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap> </keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Prints the selected article.</action>
+<action>Prints the selected article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
-> File</guimenu
-> <guimenuitem
->Send pending messages</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu> File</guimenu> <guimenuitem>Send pending messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->The messages in the Outbox folder are sent.</action>
+<action>The messages in the Outbox folder are sent.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
-> File</guimenu
-> <guimenuitem
->Stop Network</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu> File</guimenu> <guimenuitem>Stop Network</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Disconnects the current connection to a newsserver.</action>
+<action>Disconnects the current connection to a newsserver.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Quits &knode;.</action>
+<action>Quits &knode;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -123,89 +68,46 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Edit</guimenu
-> menu</title>
+<title>The <guimenu>Edit</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>C</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Copy the selected text to the clipboard.</action>
+<action>Copy the selected text to the clipboard.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select all</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select all</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Selects the whole article.</action>
+<action>Selects the whole article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycap
->F4</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Search articles</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycap>F4</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Search articles</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Search Dialogue Box for searching in the active group.</action>
+<action>Opens the Search Dialogue Box for searching in the active group.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Fetch article with ID...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Fetch article with ID...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Enables the download of an article with a specified article-ID.</action>
+<action>Enables the download of an article with a specified article-ID.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -214,211 +116,120 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->View</guimenu
-> menu</title>
+<title>The <guimenu>View</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Threads</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Show Threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->When this is activated, &knode; shows discussions as a tree view in the article view.</para>
+<para>When this is activated, &knode; shows discussions as a tree view in the article view.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Expand all threads</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Expand all threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->When this is activated, &knode; shows the complete threads; this is only functional when <guilabel
->Show threads</guilabel
-> is active.</para>
+<para>When this is activated, &knode; shows the complete threads; this is only functional when <guilabel>Show threads</guilabel> is active.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Collapse all threads</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Collapse all threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->When this is activated, &knode; shows no threads; this is only functional when <guilabel
->Show threads</guilabel
-> is active.</para>
+<para>When this is activated, &knode; shows no threads; this is only functional when <guilabel>Show threads</guilabel> is active.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->T</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Toggle Subthread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>T</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Toggle Subthread</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles between showing and collapsing the selected thread.</action>
+<action>Toggles between showing and collapsing the selected thread.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Filter</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Filter</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Allows you to choose a filter for the article view.</action>
+<action>Allows you to choose a filter for the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Sort</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Sort</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Allows you to sort the article view.</action>
+<action>Allows you to sort the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->F5</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Refresh list</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>F5</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Refresh list</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Refreshes the article view</action>
+<action>Refreshes the article view</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show all headers</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Show all headers</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->When this setting is activated, &knode; shows the complete article header in the article window.</action>
+<action>When this setting is activated, &knode; shows the complete article header in the article window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Unscramble (ROT 13)</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Unscramble (ROT 13)</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->When this setting is activated, &knode; shows all characters of the complete article rotated by 13 characters.</action>
+<action>When this setting is activated, &knode; shows all characters of the complete article rotated by 13 characters.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Verify PGP signature</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Verify PGP signature</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Checks the PGP signature in the article.</action>
+<action>Checks the PGP signature in the article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->X</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Use fixed font</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>X</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Use fixed font</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Activates the configured fixed-width font for the viewer.</action>
+<action>Activates the configured fixed-width font for the viewer.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Charset</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Charset</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can configure the charset which is used for the articles.</action>
+<action>Here you can configure the charset which is used for the articles.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -427,135 +238,68 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Go</guimenu
-> menu</title>
+<title>The <guimenu>Go</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->B</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>B</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to previous article in the article view.</action>
+<action>Jumps to previous article in the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->N</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>N</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to next article in the article view.</action>
+<action>Jumps to next article in the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Alt;<keycap
->Space</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next unread article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next unread article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the next unread article, and to the first unread article of the next newsgroup if necessary.</action>
+<action>Jumps to the next unread article, and to the first unread article of the next newsgroup if necessary.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next unread thread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next unread thread</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the next unread thread, and to the next unread thread in the next newsgroup if necessary.</action>
+<action>Jumps to the next unread thread, and to the next unread thread in the next newsgroup if necessary.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->-</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous group</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>-</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the previous news group in the folder view</action>
+<action>Jumps to the previous news group in the folder view</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->+</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next group</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>+</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the next newsgroup in the folder view</action>
+<action>Jumps to the next newsgroup in the folder view</action>
 </para>
 </listitem>
 </varlistentry>
@@ -564,99 +308,58 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Account</guimenu
-> menu</title>
+<title>The <guimenu>Account</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Get new articles in all groups</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Get new articles in all groups</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Connects with the active account and fetches any new messages.</action>
+<action>Connects with the active account and fetches any new messages.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Subscribe to Newsgroups</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Opens the Dialogue Box for subscribing to newsgroups for the active account.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Subscribe to Newsgroups</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para> 
+<action>Opens the Dialogue Box for subscribing to newsgroups for the active account.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Expire all groups</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Expire all groups</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can expire all groups of an account manually.</action>
+<action>Here you can expire all groups of an account manually.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Account Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Account Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the properties dialogue for the active account.</action>
+<action>Opens the properties dialogue for the active account.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Delete Account</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Delete Account</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes the active account and all subscribed newsgroups therein.</action>
+<action>Deletes the active account and all subscribed newsgroups therein.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -665,121 +368,76 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Group</guimenu
-> menu</title>
+<title>The <guimenu>Group</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Get new articles</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Get new articles</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Connects with the active account and fetches any new messages.</action>
+<action>Connects with the active account and fetches any new messages.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Expire group</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Expire group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Checks if there are any old articles and, if so, deletes them.</action>
+<action>Checks if there are any old articles and, if so, deletes them.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Reorganise group</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Reorganise group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Rebuilds the article view by using the configured sortings.</action>
+<action>Rebuilds the article view by using the configured sortings.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Mark all as read</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Mark all as read</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Sets the status of all articles in the active newsgroup to read.</action>
+<action>Sets the status of all articles in the active newsgroup to read.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Mark all as unread</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Mark all as unread</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Sets the status of all articles in the active newsgroup to unread.</action>
+<action>Sets the status of all articles in the active newsgroup to unread.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Group Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Group Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the dialogue for the group properties.</action>
+<action>Opens the dialogue for the group properties.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Unsubscribe</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Unsubscribe</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Unsubscribes from the active newsgroup</action>
+<action>Unsubscribes from the active newsgroup</action>
 </para>
 </listitem>
 </varlistentry>
@@ -789,162 +447,96 @@
 
 
 <sect2>
-<title
->The <guimenu
->Folder</guimenu
-> menu</title>
+<title>The <guimenu>Folder</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->New Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>New Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Creates a new main folder.</action>
+<action>Creates a new main folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->New Subfolder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>New Subfolder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Creates a new subfolder.</action>
+<action>Creates a new subfolder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Rename Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Rename Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can rename the active folder.</action>
+<action>Here you can rename the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Import MBox Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Import MBox Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->With this function it is possible to import an MBox folder into the active folder.</action>
+<action>With this function it is possible to import an MBox folder into the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Export as MBox Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Export as MBox Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->With this function you can export the active folder as an MBox folder.</action>
+<action>With this function you can export the active folder as an MBox folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Compact Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Compact Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Removes all deleted articles from the active folder.</action>
+<action>Removes all deleted articles from the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Compact All Folders</guimenuitem
-> </menuchoice>
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Removes all deleted articles from the every folder.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Empty Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Compact All Folders</guimenuitem> </menuchoice>
+</term> 
+<listitem> 
+<para> 
+<action>Removes all deleted articles from the every folder.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Empty Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes all articles from the active folder.</action>
+<action>Deletes all articles from the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Delete Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Delete Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes the active folder.</action>
+<action>Deletes the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -953,310 +545,143 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Article</guimenu
-> menu</title>
+<title>The <guimenu>Article</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->P</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Post To Newsgroup</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>P</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Post To Newsgroup</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer, with the settings for writing new articles set to those of the active newsgroup.</action>
+<action>Opens the Composer, with the settings for writing new articles set to those of the active newsgroup.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->R</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Followup To Newsgroup</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>R</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Followup To Newsgroup</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer for writing a followup, with the content of the active article.</action>
+<action>Opens the Composer for writing a followup, with the content of the active article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->A</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Reply by Email</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>A</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Reply by Email</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer for writing an e-mail to the author of the active article.</action>
+<action>Opens the Composer for writing an e-mail to the author of the active article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->F</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Forward by Email</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>F</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Forward by Email</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer for forwarding the active article as e-mail.</action>
+<action>Opens the Composer for forwarding the active article as e-mail.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->D</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark as Read</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycap>D</keycap></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark as Read</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active article to<quote
-> read</quote
-> </para>
+<para>Set the status of the active article to<quote> read</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->U</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark as Unread</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycap>U</keycap></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark as Unread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active article to<quote
-> unread</quote
-> </para>
+<para>Set the status of the active article to<quote> unread</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->D</keycap
-></keycombo
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark Thread as Read</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark Thread as Read</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active thread to<quote
-> read</quote
-> </para>
+<para>Set the status of the active thread to<quote> read</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark Thread as Unread</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark Thread as Unread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active thread to<quote
-> unread</quote
-> </para>
+<para>Set the status of the active thread to<quote> unread</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->Cancel Article</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>Cancel Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Generate a message which deletes the active Article in Usenet; you can only use this with your own articles.</action>
+<action>Generate a message which deletes the active Article in Usenet; you can only use this with your own articles.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->Supersede Article</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>Supersede Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer with the content of the active article; when this article is posted it overwrites the original article. You can only use this with your own articles.</action>
+<action>Opens the Composer with the content of the active article; when this article is posted it overwrites the original article. You can only use this with your own articles.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->O</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Open in own window</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>O</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Open in own window</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->The active article is opened in a new window.</action>
+<action>The active article is opened in a new window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->View Source</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>View Source</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->The source code of the active article is opened in a new window.</action>
+<action>The source code of the active article is opened in a new window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->E</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Edit Article...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>E</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Edit Article...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Opens the Composer for editing the active article;</action
-> you can only use this in the <guilabel
-> Outbox</guilabel
-> and <guilabel
-> Drafts</guilabel
-> folders.</para>
+<para><action> Opens the Composer for editing the active article;</action> you can only use this in the <guilabel> Outbox</guilabel> and <guilabel> Drafts</guilabel> folders.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->Delete</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Delete Article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>Delete</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Delete Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Deletes the active article.</action
-> You can only use this in the <guilabel
-> Outbox</guilabel
-> and <guilabel
-> Drafts</guilabel
-> folders.</para>
+<para><action> Deletes the active article.</action> You can only use this in the <guilabel> Outbox</guilabel> and <guilabel> Drafts</guilabel> folders.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->Send now</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>Send now</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Sends the active article.</action
-> You can only use this in the <guilabel
-> Outbox</guilabel
-> and <guilabel
-> Drafts</guilabel
-> folders.</para>
+<para><action> Sends the active article.</action> You can only use this in the <guilabel> Outbox</guilabel> and <guilabel> Drafts</guilabel> folders.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1264,149 +689,66 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Scoring</guimenu
-> menu</title>
+<title>The <guimenu>Scoring</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Edit Scoring Rules...</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->The dialogue to edit the scoring rules will be opened.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><guimenu
->Scoring</guimenu
-> <guimenuitem
->Recalculate scores</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->The scores will be reset and recalculated.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Lower Score for Author...</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Creates a rule for lowering the score of all articles posted by the author of the active article.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Raise Score for Author...</guimenuitem
-> </menuchoice>
-</term>
-<listitem
-> 
-<para
-> 
-<action
->Creates a rule for raising the score of all articles posted by the author of the active article.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><shortcut
-><keycap
->W</keycap
-></shortcut
-><guimenu
->Scoring</guimenu
-> <guimenuitem
->Watch Thread</guimenuitem
-> </menuchoice>
-</term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Edit Scoring Rules...</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>The dialogue to edit the scoring rules will be opened.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><guimenu>Scoring</guimenu> <guimenuitem>Recalculate scores</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para> 
+<action>The scores will be reset and recalculated.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Lower Score for Author...</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Creates a rule for lowering the score of all articles posted by the author of the active article.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Raise Score for Author...</guimenuitem> </menuchoice>
+</term>
+<listitem> 
+<para> 
+<action>Creates a rule for raising the score of all articles posted by the author of the active article.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><shortcut><keycap>W</keycap></shortcut><guimenu>Scoring</guimenu> <guimenuitem>Watch Thread</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Sets the score for this thread to the configured score of watched threads (standard = 100).</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycap>I</keycap></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Ignore Thread</guimenuitem> </menuchoice>
+</term>
 <listitem>
 <para>
-<action
->Sets the score for this thread to the configured score of watched threads (standard = 100).</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycap
->I</keycap
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Ignore Thread</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Sets the score for this thread to the configured score of ignored threads (standard = -100).</action>
+<action>Sets the score for this thread to the configured score of ignored threads (standard = -100).</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1415,90 +757,57 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Settings</guimenu
-> menu</title>
+<title>The <guimenu>Settings</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the toolbar is shown or not.</action>
+<action>This option toggles whether the toolbar is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Statusbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Statusbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the statusbar is shown or not.</action>
+<action>This option toggles whether the statusbar is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Group view</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Group view</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the group list is shown or not.</action>
+<action>This option toggles whether the group list is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Header view</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Header view</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the header view is shown or not.</action>
+<action>This option toggles whether the header view is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Article viewer</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Article viewer</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the article is shown or not.</action>
+<action>This option toggles whether the article is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1506,49 +815,31 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the key bindings.</action>
+<action>Opens a dialogue for configuring the key bindings.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the toolbars.</action>
+<action>Opens a dialogue for configuring the toolbars.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure KNode...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure KNode...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring &knode;.</action>
+<action>Opens a dialogue for configuring &knode;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1557,121 +848,60 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Help</guimenu
-> menu</title>
+<title>The <guimenu>Help</guimenu> menu</title>
 &help.menu.documentation; </sect2>
 </sect1>
 
 <sect1 id="knode-editorwindow">
-<title
->The composer menus.</title>
+<title>The composer menus.</title>
 
-<sect2
-> 
-<title
->The <guimenu
->File</guimenu
-> menu</title>
+<sect2> 
+<title>The <guimenu>File</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Return</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Send Now</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Send Now</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Sends the current article immediately.</action>
+<action>Sends the current article immediately.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Send Later</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
->Stores the current article in the <guilabel
-> Outbox</guilabel
-> to be sent later.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Send Later</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para>Stores the current article in the <guilabel> Outbox</guilabel> to be sent later.</para> 
+</listitem> 
+</varlistentry> 
 <varlistentry>
-<term
-> 
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save as Draft</guimenuitem
-> </menuchoice>
+<term> 
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Save as Draft</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Saves the current article in the <guilabel
-> Drafts</guilabel
-> folder, so you can finish editing it another time.</para>
+<para>Saves the current article in the <guilabel> Drafts</guilabel> folder, so you can finish editing it another time.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Delete</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Delete</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes the current article, closing the editor.</action>
+<action>Deletes the current article, closing the editor.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Close</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Close</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Closes the editor window</action>
+<action>Closes the editor window</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1680,284 +910,131 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Edit</guimenu
-> menu</title>
+<title>The <guimenu>Edit</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Undo the last edit.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Shift</keycap
-><keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para
->Redo the last action undone with the <guimenuitem
-> Undo</guimenuitem
-> menu entry.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Cuts the currently-selected text to the clipboard, deleting it from the editor window.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
+</term> 
+<listitem> 
+<para> 
+<action>Undo the last edit.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Shift</keycap><keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>Redo the last action undone with the <guimenuitem> Undo</guimenuitem> menu entry.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Cuts the currently-selected text to the clipboard, deleting it from the editor window.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
-<listitem>
-<para>
-<action
->Copies the selected text to the clipboard.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Pastes the current contents of the clipboard into the editor window.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Paste as Quotation</guimenuitem
-> </menuchoice>
+<listitem>
+<para>
+<action>Copies the selected text to the clipboard.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para> 
+<action>Pastes the current contents of the clipboard into the editor window.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Paste as Quotation</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Pastes the current contents of the clipboard into the editor window with a quote character </action
-> (<quote
->&gt;</quote
->) at the beginning of each line. </para>
+<para><action> Pastes the current contents of the clipboard into the editor window with a quote character </action> (<quote>&gt;</quote>) at the beginning of each line. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Select All</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Select All</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Selects all the text in the editor window.</action>
+<action>Selects all the text in the editor window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find</guimenuitem
-> </menuchoice>
-</term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find</guimenuitem> </menuchoice>
+</term>
 <listitem>
 <para>
-<action
->Opens the Find dialogue.</action>
+<action>Opens the Find dialogue.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace...</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Opens the Replace dialogue.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace...</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Opens the Replace dialogue.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
  
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->The <guimenu
->Attach</guimenu
-> menu</title>
+<sect2> 
+<title>The <guimenu>Attach</guimenu> menu</title>
 <para>
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Append Signature</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Append Signature</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts your signature at the end of the article you are editing.</action>
+<action>Inserts your signature at the end of the article you are editing.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Insert File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Insert File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts the contents of a file into the editor window.</action>
+<action>Inserts the contents of a file into the editor window.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Insert File (in a box)...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Insert File (in a box)...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts the contents of a file into the editor window and puts a box around of it.</action>
+<action>Inserts the contents of a file into the editor window and puts a box around of it.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1965,17 +1042,11 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts a file as an attachment.</action>
+<action>Inserts a file as an attachment.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1984,73 +1055,46 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Options</guimenu
-> menu</title>
+<title>The <guimenu>Options</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Send News-Article</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Send News-Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the message is to be sent as an article or not.</action>
+<action>Toggles whether the message is to be sent as an article or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Send Email</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Send Email</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the message is to be sent as an email or not; if it's configured, an external editor will be activated.</action>
+<action>Toggles whether the message is to be sent as an email or not; if it's configured, an external editor will be activated.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Set Charset</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Set Charset</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can configure the charset used for this article; normally you use us-ascii for English-speaking areas.</action>
+<action>Here you can configure the charset used for this article; normally you use us-ascii for English-speaking areas.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Word Wrap</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Word Wrap</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles the word wrapping in the editor on or off.</action>
+<action>Toggles the word wrapping in the editor on or off.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -2059,159 +1103,94 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Tools</guimenu
-> menu</title>
+<title>The <guimenu>Tools</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Add Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Add Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Puts <quote
->&gt;</quote
-> in front of the marked lines. </para>
+<para>Puts <quote>&gt;</quote> in front of the marked lines. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Remove Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Remove Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Removes the quote characters at the beginning of the marked lines.</action>
+<action>Removes the quote characters at the beginning of the marked lines.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Add Box</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Add Box</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Puts the marked lines in an ASCII box.</action>
+<action>Puts the marked lines in an ASCII box.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Remove Box</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Remove Box</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Removes the ASCII box around the marked area.</action>
+<action>Removes the ASCII box around the marked area.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Sign Article with PGP</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Sign Article with PGP</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Signs the article with PGP.</action>
+<action>Signs the article with PGP.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Get Original Text (not rewrapped)</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Get Original Text (not rewrapped)</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Rebuilds the original posting when answering to an article.</action>
+<action>Rebuilds the original posting when answering to an article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Scramble (Rot-13)</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Scramble (Rot-13)</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Encrypts the marked text by rotating every character 13 characters of the alphabet.</action>
+<action>Encrypts the marked text by rotating every character 13 characters of the alphabet.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Start External Editor</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Start External Editor</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Start the external editor (if one is configured) with the current contents of the editor window.</action>
+<action>Start the external editor (if one is configured) with the current contents of the editor window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue box to check your spelling.</action>
+<action>Opens a dialogue box to check your spelling.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -2220,89 +1199,56 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Settings</guimenu
-> menu</title>
+<title>The <guimenu>Settings</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the toolbar should be shown or not.</action>
+<action>Toggles whether the toolbar should be shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Statusbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Statusbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the statusbar should be shown or not.</action>
+<action>Toggles whether the statusbar should be shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the key bindings.</action>
+<action>Opens a dialogue for configuring the key bindings.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the toolbars.</action>
+<action>Opens a dialogue for configuring the toolbars.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure KNode...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure KNode...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Open the &knode; Preferences dialogue.</action>
+<action>Open the &knode; Preferences dialogue.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -2311,10 +1257,7 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Help</guimenu
-> menu</title>
+<title>The <guimenu>Help</guimenu> menu</title>
 &help.menu.documentation; </sect2>
 
 </sect1>